Commit 6262afa1 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: default to zero if int/hex symbol lacks default property 



When a default property is missing in an int or hex symbol, it defaults
to an empty string, which is not a valid symbol value.

It results in an incorrect .config, and can also lead to an infinite
loop in scripting.

Use "0" for int and "0x0" for hex as a default value.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarYoann Congal <yoann.congal@smile.fr>
parent 4e244c10

scripts/kconfig/symbol.c

+12 −5
Original line number Diff line number Diff line
@@ -338,7 +338,11 @@ void sym_calc_value(struct symbol *sym) 


	switch (sym->type) {

	case S_INT:

		newval.val = "0";

		break;

	case S_HEX:

		newval.val = "0x0";

		break;

	case S_STRING:

		newval.val = "";

		break;
@@ -746,14 +750,17 @@ const char *sym_get_string_default(struct symbol *sym) 
		case yes: return "y";

		}

	case S_INT:

		if (!str[0])

			str = "0";

		break;

	case S_HEX:

		return str;

	case S_STRING:

		return str;

	case S_UNKNOWN:

		if (!str[0])

			str = "0x0";

		break;

	default:

		break;

	}

	return "";

	return str;

}



const char *sym_get_string_value(struct symbol *sym)