diff --git a/CHANGELOG b/CHANGELOG index fc6d1e9b..f7cf259a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -66,6 +66,9 @@ HISTORY ++ Bugfixes: + 2012-09-26: patch by Henrik Persson + * dhcp.c: patch #7843 Fix corner case with dhcp timeouts + 2012-09-26: patch by Henrik Persson * dhcp.c: patch #7840 Segfault in dhcp_parse_reply if no end marker in dhcp packet diff --git a/src/core/dhcp.c b/src/core/dhcp.c index 071190d6..eb12c550 100644 --- a/src/core/dhcp.c +++ b/src/core/dhcp.c @@ -963,7 +963,7 @@ dhcp_bind(struct netif *netif) } /* If we have sub 1 minute lease, t2 and t1 will kick in at the same time. */ - if (dhcp->t1_timeout >= dhcp->t2_timeout && dhcp->t2_timeout > 0) { + if ((dhcp->t1_timeout >= dhcp->t2_timeout) && (dhcp->t2_timeout > 0)) { dhcp->t1_timeout = 0; }