[git commit] udhcpc: fix a problem with binary-encoded options #2
Denys Vlasenko
vda.linux at googlemail.com
Fri May 17 13:13:38 UTC 2013
commit: http://git.busybox.net/busybox/commit/?id=c133fa66f37d69efb0d2e10ad2e068564933d92c
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
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 ae0e0d3..9c27cd0 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -424,7 +424,7 @@ static NOINLINE void attach_option(
existing->data[OPT_DATA + old_len] = ' ';
old_len++;
}
- memcpy(existing->data + OPT_DATA + old_len, buffer, length);
+ memcpy(existing->data + OPT_DATA + old_len, (allocated ? allocated : buffer), length);
existing->data[OPT_LEN] = old_len + length;
} /* else, ignore the data, we could put this in a second option in the future */
} /* else, ignore the new data */
More information about the busybox-cvs
mailing list