Merge pull request contiki-os#2164 from alexstanoev/web-demo-crash-fix

Zero out httpd_state before deallocating
JasonOldWoo · Apr 1, 2017 · 6eac731 · 6eac731
2 parents 12f1721 + a303641
commit 6eac731
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/examples/cc26xx/cc26xx-web-demo/httpd-simple.c b/examples/cc26xx/cc26xx-web-demo/httpd-simple.c
@@ -1268,9 +1268,7 @@ appcall(void *state)
 
   if(uip_closed() || uip_aborted() || uip_timedout()) {
     if(s != NULL) {
-      s->script = NULL;
-      s->blen = 0;
-      s->tmp_buf_len = 0;
+      memset(s, 0, sizeof(struct httpd_state));
       memb_free(&conns, s);
     }
   } else if(uip_connected()) {
@@ -1291,7 +1289,7 @@ appcall(void *state)
     if(uip_poll()) {
       if(timer_expired(&s->timer)) {
         uip_abort();
-        s->script = NULL;
+        memset(s, 0, sizeof(struct httpd_state));
         memb_free(&conns, s);
       }
     } else {