Added brackets, completed CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 8f7af0f8fc16d58adbd882defb711af132bed490..2cdf73c93042ec82c4aa0272d7f1af9efa49b1d3 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,6 +80,9 @@ HISTORY
 
  ++ Bugfixes:
 
+  2012-09-26: patch by Henrik Persson
+  * dhcp.c: patch #7840 Segfault in dhcp_parse_reply if no end marker in dhcp packet
+
   2012-08-22: Simon Goldschmidt
   * memp.c: fixed bug #37166: memp_sanity check loops itself
 

diff --git a/src/core/dhcp.c b/src/core/dhcp.c
index 8b2139da3484497898dfb4949c50c43d1a8c10d6..932165743b9fd5e8b594ef3dddffebfd82f3ddf1 100644 (file)
--- a/src/core/dhcp.c
+++ b/src/core/dhcp.c
@@ -1472,7 +1472,7 @@ decode_next:
     if (offset >= q->len) {
       offset -= q->len;
       offset_max -= q->len;
-      if (offset < offset_max && offset_max) {
+      if ((offset < offset_max) && offset_max) {
         q = q->next;
         LWIP_ASSERT("next pbuf was null", q);
         options = (u8_t*)q->payload;