diff --git a/CHANGELOG b/CHANGELOG
index e7c4aa8f..fc6d1e9b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -66,6 +66,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 ec649d97..41acbfff 100644
--- a/src/core/dhcp.c
+++ b/src/core/dhcp.c
@@ -1471,7 +1471,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;