summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-10-03 09:38:50 +0000
committerTom Rini <trini@ti.com>2012-10-15 11:54:05 -0700
commit586197dfe42ffda777205b02fe404107eb7d974a (patch)
treef7f06afcf49dac5dec0f5d33e4be48d3ab8e768a /common
parente4a223f04de2e271682f26d7b981c0012f6a459f (diff)
downloadu-boot-imx-586197dfe42ffda777205b02fe404107eb7d974a.zip
u-boot-imx-586197dfe42ffda777205b02fe404107eb7d974a.tar.gz
u-boot-imx-586197dfe42ffda777205b02fe404107eb7d974a.tar.bz2
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>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_nvedit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index d655ab9..1f9c674 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -650,6 +650,9 @@ U_BOOT_CMD(
*/
int envmatch(uchar *s1, int i2)
{
+ if (s1 == NULL)
+ return -1;
+
while (*s1 == env_get_char(i2++))
if (*s1++ == '=')
return i2;