minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

getenv_f(): fix handling of too short buffers

Browse Source 
Fix error handling in getenv_f() when the user provided buffer is too
short to hold the variable name; make sure to truncate and
NUL-terminate without overwriting the buffer limits.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2010-07-24 22:16:20 +02:00
parent 739b8080af
commit 9ed4a9582f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/cmd_nvedit.c
View File

@ -557,13 +557,19 @@ int getenv_f(char *name, char *buf, unsigned len)
} }
if ((val=envmatch((uchar *)name, i)) < 0) if ((val=envmatch((uchar *)name, i)) < 0)
continue; continue;
/* found; copy out */ /* found; copy out */
n = 0; for (n=0; n<len; ++n, ++buf) {
while ((len > n++) && (*buf++ = env_get_char(val++)) != '\0') if ((*buf = env_get_char(val++)) == '\0')
; return n;
if (len == n) }
*buf = '\0';
return (n); if (n)
*--buf = '\0';
printf("env_buf too small [%d]\n", len);
return n;
} }
return (-1); return (-1);
} }