Avoid to use unsetted internal error resource

Sebastiano Merlino · Sebastiano Merlino · commit 089f7c7b0afd · 2012-12-07T20:37:18.000+01:00
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -1213,7 +1213,7 @@ void webserver::method_not_allowed_page(http_response** dhrs, details::modded_re
 
 void webserver::internal_error_page(http_response** dhrs, details::modded_request* mr, bool force_our)
 {
-    if(internal_error_resource != 0x0 || !force_our)
+    if(internal_error_resource != 0x0 && !force_our)
         ((internal_error_resource)->*(mr->callback))(*mr->dhr, dhrs);
     else
         *dhrs = new http_string_response(GENERIC_ERROR, http_utils::http_internal_server_error);

Original file line number	Diff line number	Diff line change
`@@ -1213,7 +1213,7 @@ void webserver::method_not_allowed_page(http_response** dhrs, details::modded_re`
`1213`	`1213`
`1214`	`1214`	`void webserver::internal_error_page(http_response** dhrs, details::modded_request* mr, bool force_our)`
`1215`	`1215`	`{`
`1216`		`- if(internal_error_resource != 0x0 \|\| !force_our)`
	`1216`	`+ if(internal_error_resource != 0x0 && !force_our)`
`1217`	`1217`	`((internal_error_resource)->(mr->callback))(mr->dhr, dhrs);`
`1218`	`1218`	`else`
`1219`	`1219`	`*dhrs = new http_string_response(GENERIC_ERROR, http_utils::http_internal_server_error);`