summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-02-06 17:00:58 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-02-06 17:00:58 (GMT)
commitfbea22056014a05a0c6619eb458d4955869b5e93 (patch)
treeb014af1203ce3bcfda9204014f7be9f8d440b2e3
parent281e7b8848108f26253ffc466fc149c04665a2c2 (diff)
downloadbusybox-fbea22056014a05a0c6619eb458d4955869b5e93.tar.gz
busybox-fbea22056014a05a0c6619eb458d4955869b5e93.tar.bz2
udhcpc: fix a problem with binary-encoded options
function old new delta attach_option 395 413 +18 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/udhcp/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 311f79e..0a60261 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -375,7 +375,7 @@ static NOINLINE void attach_option(
new->data = xmalloc(length + OPT_DATA);
new->data[OPT_CODE] = optflag->code;
new->data[OPT_LEN] = length;
- memcpy(new->data + OPT_DATA, buffer, length);
+ memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer), length);
curr = opt_list;
while (*curr && (*curr)->data[OPT_CODE] < optflag->code)