diff options
| author |   Masahiro Yamada <masahiroy@kernel.org> | 2021-10-01 14:32:44 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2021-10-01 17:28:17 +0900 |
| commit | 229d0cfae5b21bfc42525cf43b0b4279243acc4e (patch) | |
| tree | 46de5d2794e9f067e749db5d914beabbc4c02a10 /scripts/kconfig/confdata.c | |
| parent | kconfig: rename a variable in the lexer to a clearer name (diff) | |
| download | linux-dev-229d0cfae5b21bfc42525cf43b0b4279243acc4e.tar.xz linux-dev-229d0cfae5b21bfc42525cf43b0b4279243acc4e.zip | |
kconfig: remove 'const' from the return type of sym_escape_string_value()
sym_escape_string_value() returns a malloc'ed memory, but as
(const char *). So, it must be casted to (void *) when it is free'd.
This is odd.
The return type of sym_escape_string_value() should be (char *).
I exploited that free(NULL) has no effect.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | scripts/kconfig/confdata.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index cf72680cd769..9b2271eb43d6 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -728,21 +728,22 @@ static struct conf_printer header_printer_cb = static void conf_write_symbol(FILE *fp, struct symbol *sym, struct conf_printer *printer, void *printer_arg) { - const char *str; + const char *val; + char *escaped = NULL; - switch (sym->type) { - case S_UNKNOWN: - break; - case S_STRING: - str = sym_get_string_value(sym); - str = sym_escape_string_value(str); - printer->print_symbol(fp, sym, str, printer_arg); - free((void *)str); - break; - default: - str = sym_get_string_value(sym); - printer->print_symbol(fp, sym, str, printer_arg); + if (sym->type == S_UNKNOWN) + return; + + val = sym_get_string_value(sym); + + if (sym->type == S_STRING) { + escaped = sym_escape_string_value(val); + val = escaped; } + + printer->print_symbol(fp, sym, val, printer_arg); + + free(escaped); } static void |