diff options
| author | Michal Kazior <michal@plume.com> | 2019-09-25 14:03:13 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2019-10-08 15:14:46 +0200 |
| commit | 1f1988d5256c9705a4f296ed48cdb7e463525ba4 (patch) | |
| tree | 929b37d9ed9f45ea27de2ed4da036d74c5dc7ce6 | |
| parent | 6c1af283f73fb8640cd7273c2bf13eb102f80954 (diff) | |
| download | busybox-w32-1f1988d5256c9705a4f296ed48cdb7e463525ba4.tar.gz busybox-w32-1f1988d5256c9705a4f296ed48cdb7e463525ba4.tar.bz2 busybox-w32-1f1988d5256c9705a4f296ed48cdb7e463525ba4.zip | |
udhcpc: fix segmentation fault on empty bin opt
The following caused udhcpc to segfault:
busybox udhcpc -i lo -s /dev/null -x 0x3d:
function old new delta
udhcp_str2optset 629 641 +12
Signed-off-by: Michal Kazior <michal@plume.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/udhcp/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index 4a452cdb9..9ec752dfc 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c | |||
| @@ -539,7 +539,7 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg, | |||
| 539 | 539 | ||
| 540 | if (optflag->flags == OPTION_BIN) { | 540 | if (optflag->flags == OPTION_BIN) { |
| 541 | val = strtok(NULL, ""); /* do not split "'q w e'" */ | 541 | val = strtok(NULL, ""); /* do not split "'q w e'" */ |
| 542 | trim(val); | 542 | if (val) trim(val); |
| 543 | } else | 543 | } else |
| 544 | val = strtok(NULL, ", \t"); | 544 | val = strtok(NULL, ", \t"); |
| 545 | if (!val) | 545 | if (!val) |
