 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.169 2021/03/28 18:21:28 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.170 2021/03/28 18:28:22 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.169 2021/03/28 18:21:28 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.170 2021/03/28 18:28:22 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -1156,91 +1156,72 @@ initialization_add_designator_subscript(
 		int auto_dim = (int)range.hi;
 		if (auto_dim > level->bl_type->t_dim)
 			brace_level_set_array_dimension(level, auto_dim);
+	}
 	debug_leave();
+}
 static bool
 is_string_array(const type_t *tp, tspec_t t)
+{
 	tspec_t st;
-	if (tp->t_tspec != ARRAY)
+	if (tp == NULL || tp->t_tspec != ARRAY)
 		return false;
 	st = tp->t_subt->t_tspec;
 	return t == CHAR
 	    ? st == CHAR || st == UCHAR || st == SCHAR
 	    : st == WCHAR;
+}
 /* Initialize a character array or wchar_t array with a string literal. */
 static bool
 initialization_init_array_using_string(struct initialization *in, tnode_t *tn)
+{
 	struct brace_level *level;
 	int	len;
 	strg_t	*strg;
 	if (tn->tn_op != STRING)
 		return false;
 	debug_enter();
 	initialization_debug(in);
 	level = in->brace_level;
 	strg = tn->tn_string;
 	/*
 	 * Check if we have an array type which can be initialized by
 	 * the string.
 	 */
-	if (level->bl_subtype != NULL && level->bl_subtype->t_tspec == ARRAY) {
+	if (is_string_array(level->bl_subtype, strg->st_tspec)) {
 		debug_step("subtype is an array");
 		if (!is_string_array(level->bl_subtype, strg->st_tspec)) {
 			debug_leave();
 			return false;
 		/* Put the array at top of stack */
 		initialization_push(in);
 		level = in->brace_level;
-		/* TODO: what if both bl_type and bl_subtype are ARRAY? */
+	} else if (is_string_array(level->bl_type, strg->st_tspec)) {
 	} else if (level->bl_type != NULL && level->bl_type->t_tspec == ARRAY) {
 		debug_step("type is an array");
 		if (!is_string_array(level->bl_type, strg->st_tspec)) {
 			debug_leave();
 			return false;
 		/*
 		 * TODO: is this really not needed in the branch above this
 		 * one?
 		 */
 		/*
 		 * If the array is already partly initialized, we are
 		 * wrong here.
 		 */
-		if (level->bl_remaining != level->bl_type->t_dim) {
+		if (level->bl_remaining != level->bl_type->t_dim)
-			debug_leave();
+			goto nope;
-			return false;
+	} else
 		goto nope;
 	} else {
 		debug_leave();
 		return false;
 	/* Get length without trailing NUL character. */
 	len = strg->st_len;
 	if (level->bl_array_of_unknown_size) {
 		level->bl_array_of_unknown_size = false;
 		level->bl_type->t_dim = len + 1;
 		setcomplete(level->bl_type, true);
 	} else {
 		/*
 		 * TODO: check for buffer overflow in the object to be
 		 * initialized
 		 */
 @@ -1253,26 +1234,29 @@ initialization_init_array_using_string(s
 		/*
 		 * TODO: C99 6.7.8p14 allows a string literal to be enclosed
 		 * in optional redundant braces, just like scalars.  Add tests
 		 * for this.
 		 */
+	}
 	/* In every case the array is initialized completely. */
 	level->bl_remaining = 0;
 	initialization_debug(in);
 	debug_leave();
 	return true;
 nope:
 	debug_leave();
 	return false;
+}
 /*
  * Initialize a non-array object with automatic storage duration and only a
  * single initializer expression without braces by delegating to ASSIGN.
  */
 static bool
 initialization_init_using_assign(struct initialization *in, tnode_t *rn)
+{
 	tnode_t *ln, *tn;
 	if (in->initsym->s_type->t_tspec == ARRAY)
 		return false;