From 63775c321597c6af6bc42e58614633dff4de6189 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Fri, 19 Jan 2018 16:31:19 +0100 Subject: [PATCH] [LWIP] dhcp.c: Cherry-pick lwIP 32aa9a4. CORE-8978 - Fix a while() check order. --- sdk/lib/drivers/lwip/src/core/dhcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/lwip/src/core/dhcp.c b/sdk/lib/drivers/lwip/src/core/dhcp.c index eb12c550219..cf0b081d267 100644 --- a/sdk/lib/drivers/lwip/src/core/dhcp.c +++ b/sdk/lib/drivers/lwip/src/core/dhcp.c @@ -1377,7 +1377,7 @@ again: offset_max = options_idx_max; options = (u8_t*)q->payload; /* at least 1 byte to read and no end marker, then at least 3 bytes to read? */ - while((q != NULL) && (options[offset] != DHCP_OPTION_END) && (offset < offset_max)) { + while ((q != NULL) && (offset < offset_max) && (options[offset] != DHCP_OPTION_END)) { u8_t op = options[offset]; u8_t len; u8_t decode_len = 0;