mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-14 04:46:01 +01:00
input: avoid NULL dereference
Before using the result of env_get("stdin") we must check if it is NULL. Avoid #if. This resolves the -Wunused-but-set-variable issue and we don't need a dummy assignment in the else branch. Anyway this warning is disabled in the Makefile. For sake of readability use an early return after the configuration check. Checking CONFIG_SPL_BUILD is incorrect as env_get() is only defined if CONFIG_$(SPL_TPL)ENV_SUPPORT=y. Fixes: 985ca3945fa3 ("spl: input: Allow input in SPL and TPL") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
4860ee9b09
commit
2d307fb9ed
@ -669,17 +669,22 @@ int input_stdio_register(struct stdio_dev *dev)
|
||||
int error;
|
||||
|
||||
error = stdio_register(dev);
|
||||
#if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(ENV_SUPPORT)
|
||||
|
||||
if (!CONFIG_IS_ENABLED(ENV_SUPPORT))
|
||||
return 0;
|
||||
|
||||
if (!error) {
|
||||
const char *cstdin;
|
||||
|
||||
/* check if this is the standard input device */
|
||||
if (!error && strcmp(env_get("stdin"), dev->name) == 0) {
|
||||
cstdin = env_get("stdin");
|
||||
if (cstdin && !strcmp(cstdin, dev->name)) {
|
||||
/* reassign the console */
|
||||
if (OVERWRITE_CONSOLE ||
|
||||
console_assign(stdin, dev->name))
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
error = error;
|
||||
#endif
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user