udhcpc: fix a problem with binary-encoded options #2
authorDenys Vlasenko <vda.linux@googlemail.com>
Fri, 17 May 2013 13:13:38 +0000 (15:13 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Fri, 17 May 2013 13:13:38 +0000 (15:13 +0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/udhcp/common.c

index ae0e0d3..9c27cd0 100644 (file)
@@ -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 */