void *server_id = odhcp6c_get_state(STATE_SERVER_ID, &server_id_len);
dhcpv6_for_each_option(&rep[1], end, otype, olen, odata) {
- if ((odata + olen) > end) {
- options_valid = false;
- break;
- }
- else if (otype == DHCPV6_OPT_CLIENTID) {
+ if (otype == DHCPV6_OPT_CLIENTID) {
clientid_ok = (olen + 4U == client_id_len) && !memcmp(
&odata[-4], client_id, client_id_len);
} else if (otype == DHCPV6_OPT_SERVERID) {
#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]))