Avoid exceptions with NULL responses

Sebastiano Merlino · Sebastiano Merlino · commit 7869d315f10c · 2012-11-28T10:14:57.000+01:00
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -88,14 +88,17 @@ struct http_response_ptr
         }
         ~http_response_ptr()
         {
-            if((*num_references) == 0)
+            if(num_references)
             {
-                if(res->autodelete)
-                    delete res;
-                delete num_references;
+                if((*num_references) == 0)
+                {
+                    if(res && res->autodelete)
+                        delete res;
+                    delete num_references;
+                }
+                else
+                    (*num_references)--;
             }
-            else
-                (*num_references)--;
         }
         http_response& operator* ()
         {
@@ -538,8 +541,11 @@ void webserver::sweet_kill()
 void webserver::request_completed (void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe) 
 {
     details::modded_request* mr = (struct details::modded_request*) *con_cls;
-    if(mr->dhrs->ca != 0x0)
-        mr->dhrs->ca->do_action();
+    if(mr != 0x0 && mr->dhrs.res != 0x0)
+    {
+        if(mr->dhrs->ca != 0x0)
+            mr->dhrs->ca->do_action();
+    }
     if (NULL == mr) 
     {
         return;

Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,17 @@ struct http_response_ptr`
`88`	`88`	`}`
`89`	`89`	`~http_response_ptr()`
`90`	`90`	`{`
`91`		`- if((*num_references) == 0)`
	`91`	`+ if(num_references)`
`92`	`92`	`{`
`93`		`- if(res->autodelete)`
`94`		`- delete res;`
`95`		`- delete num_references;`
	`93`	`+ if((*num_references) == 0)`
	`94`	`+ {`
	`95`	`+ if(res && res->autodelete)`
	`96`	`+ delete res;`
	`97`	`+ delete num_references;`
	`98`	`+ }`
	`99`	`+ else`
	`100`	`+ (*num_references)--;`
`96`	`101`	`}`
`97`		`- else`
`98`		`- (*num_references)--;`
`99`	`102`	`}`
`100`	`103`	`http_response& operator* ()`
`101`	`104`	`{`
`@@ -538,8 +541,11 @@ void webserver::sweet_kill()`
`538`	`541`	`void webserver::request_completed (void cls, struct MHD_Connection connection, void **con_cls, enum MHD_RequestTerminationCode toe)`
`539`	`542`	`{`
`540`	`543`	`details::modded_request* mr = (struct details::modded_request) con_cls;`
`541`		`- if(mr->dhrs->ca != 0x0)`
`542`		`- mr->dhrs->ca->do_action();`
	`544`	`+ if(mr != 0x0 && mr->dhrs.res != 0x0)`
	`545`	`+ {`
	`546`	`+ if(mr->dhrs->ca != 0x0)`
	`547`	`+ mr->dhrs->ca->do_action();`
	`548`	`+ }`
`543`	`549`	`if (NULL == mr)`
`544`	`550`	`{`
`545`	`551`	`return;`