diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-08 18:34:03 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-08 18:34:03 +0100 |
commit | 92e531458a6c0e6464fbdc1463f91edc7fb752c7 (patch) | |
tree | 72062fc0e07619658d45b88172f230fc0ab34422 /networking/udhcp/common.c | |
parent | 12d97b66805f87e535962963e858fc2422ffdbc7 (diff) | |
download | busybox-w32-1_18_3.tar.gz busybox-w32-1_18_3.tar.bz2 busybox-w32-1_18_3.zip |
Apply post-1.18.2 fixes, bump version to 1.18.31_18_3
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp/common.c')
-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 311f79e7e..0a60261ab 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c | |||
@@ -375,7 +375,7 @@ static NOINLINE void attach_option( | |||
375 | new->data = xmalloc(length + OPT_DATA); | 375 | new->data = xmalloc(length + OPT_DATA); |
376 | new->data[OPT_CODE] = optflag->code; | 376 | new->data[OPT_CODE] = optflag->code; |
377 | new->data[OPT_LEN] = length; | 377 | new->data[OPT_LEN] = length; |
378 | memcpy(new->data + OPT_DATA, buffer, length); | 378 | memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer), length); |
379 | 379 | ||
380 | curr = opt_list; | 380 | curr = opt_list; |
381 | while (*curr && (*curr)->data[OPT_CODE] < optflag->code) | 381 | while (*curr && (*curr)->data[OPT_CODE] < optflag->code) |