Avoid server to crash on empty resources.

Sebastiano Merlino · Sebastiano Merlino · commit 0e6bd48c5a47 · 2015-01-18T02:22:28.000Z
This prevents the server to crash in case of a resource not building
any response.
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -357,11 +357,11 @@ MHD_socket create_socket (int domain, int type, int protocol)
 {
     int sock_cloexec = SOCK_CLOEXEC;
     int ctype = SOCK_STREAM | sock_cloexec;
-	
+
 	/* use SOCK_STREAM rather than ai_socktype: some getaddrinfo
     * implementations do not set ai_socktype, e.g. RHL6.2. */
     MHD_socket fd = socket(domain, ctype, protocol);
-	
+
 #ifdef _WINDOWS
 	if (fd == INVALID_SOCKET)
 #else
@@ -521,7 +521,7 @@ bool webserver::start(bool blocking)
         }
 #ifdef _WINDOWS
 		unsigned long ioarg = 1;
-        ioctlsocket(bind_socket, FIONBIO, &ioarg); 
+        ioctlsocket(bind_socket, FIONBIO, &ioarg);
 #else
         int flags = fcntl (bind_socket, F_GETFL);
         flags |= O_NONBLOCK;
@@ -1132,7 +1132,10 @@ int webserver::finalize_answer(
         try
         {
             if(hrm->is_allowed(method))
+            {
                 ((hrm)->*(mr->callback))(*mr->dhr, &dhrs);
+                if (dhrs == 0x0) internal_error_page(&dhrs, mr);
+            }
             else
             {
                 method_not_allowed_page(&dhrs, mr);
diff --git a/test/integ/basic.cpp b/test/integ/basic.cpp
@@ -132,6 +132,14 @@ class nok_resource : public http_resource<nok_resource>
         }
 };
 
+class no_response_resource : public http_resource<no_response_resource>
+{
+    public:
+        void render_GET(const http_request& req, http_response** res)
+        {
+        }
+};
+
 LT_BEGIN_SUITE(basic_suite)
 
     webserver* ws;
@@ -373,6 +381,25 @@ LT_BEGIN_AUTO_TEST(basic_suite, empty_arg)
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(empty_arg)
 
+LT_BEGIN_AUTO_TEST(basic_suite, no_response)
+    no_response_resource* resource = new no_response_resource();
+    ws->register_resource("base", resource);
+    curl_global_init(CURL_GLOBAL_ALL);
+    std::string s;
+    CURL* curl;
+    CURLcode res;
+
+    curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/base");
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    long http_code = 0;
+    curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    curl_easy_cleanup(curl);
+LT_END_AUTO_TEST(no_response)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
