LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: Check for NULL pointer in envmatch() 

If the pointer passed into envmatch() is NULL, return -1 instead of
crashing.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2012-10-03 09:38:50 +00:00 committed by Tom Rini
parent e4a223f04d
commit 586197dfe4
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/cmd_nvedit.c
View File

@ -650,6 +650,9 @@ U_BOOT_CMD(
*/ */
int envmatch(uchar *s1, int i2) int envmatch(uchar *s1, int i2)
{ {
if (s1 == NULL)
return -1;
while (*s1 == env_get_char(i2++)) while (*s1 == env_get_char(i2++))
if (*s1++ == '=') if (*s1++ == '=')
return i2; return i2;

2
tools/env/fw_env.c vendored
View File

@ -1057,6 +1057,8 @@ exit:
static char *envmatch (char * s1, char * s2) static char *envmatch (char * s1, char * s2)
{ {
if (s1 == NULL || s2 == NULL)
return NULL;
while (*s1 == *s2++) while (*s1 == *s2++)
if (*s1++ == '=') if (*s1++ == '=')