1 files changed, 4 insertions, 0 deletions

diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 9e3ce8b1c..2ff9c5669 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -287,6 +287,10 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
  * |                        valid-lifetime                         |
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
+                        /* Make sure payload contains an address */
+                        if (option[3] < 24)
+                                break;
+
                         sprint_nip6(ipv6str, option + 4);
                         *new_env() = xasprintf("ipv6=%s", ipv6str);