Revert "Fix handling of DHCPv6 messages containing option lengths exceeding the message"

[odhcp6c.git] / src / odhcp6c.h

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 87715214622def7044354a6fc46a78c70a35620b..15be59ae4de59ec94c2e91fc869f7a88f2af85b1 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -155,7 +155,7 @@ struct dhcpv6_auth_reconfigure {
 #define dhcpv6_for_each_option(start, end, otype, olen, odata)\
        for (uint8_t *_o = (uint8_t*)(start); _o + 4 <= (uint8_t*)(end) &&\
                ((otype) = _o[0] << 8 | _o[1]) && ((odata) = (void*)&_o[4]) &&\
-                ((olen) = _o[2] << 8 | _o[3]); \
+               ((olen) = _o[2] << 8 | _o[3]) + (odata) <= (uint8_t*)(end); \
                _o += 4 + (_o[2] << 8 | _o[3]))