emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcp: fix use of trim() in udhcp_str2optset()

Browse Source 
trim() modifies the string in place if needed and returns a pointer to
the end of the resulting string. Update udhcp_str2optset() so it no
longer sets the value of 'val' to the return value of trim().

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Samuel Mendoza-Jonas 2018-05-14 14:29:15 +10:00 committed by Denys Vlasenko
parent 254e47372f
commit 43b9235f66
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
networking/udhcp/common.c
View File

@ -489,9 +489,10 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg, const struct dh
int length;
char *val;
if (optflag->flags == OPTION_BIN)
val = trim(strtok(NULL, "")); /* do not split "'q w e'" */
else
if (optflag->flags == OPTION_BIN) {
val = strtok(NULL, ""); /* do not split "'q w e'" */
trim(val);
} else
val = strtok(NULL, ", \t");
if (!val)
break;