Add logic to avoid error on empty args

Sebastiano Merlino · Sebastiano Merlino · commit fbc8bd0a9f89 · 2014-03-04T01:07:10.000Z
Created also test to enforce the logic
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -749,10 +749,11 @@ int webserver::build_request_args (
         void *cls,
         enum MHD_ValueKind kind,
         const char *key,
-        const char *value
+        const char *arg_value
 )
 {
     details::modded_request* mr = static_cast<details::modded_request*>(cls);
+    char* value = (char*) ((arg_value == NULL) ? "" : arg_value);
     {
         char buf[strlen(key) + strlen(value) + 3];
         if(mr->dhr->querystring == "")
@@ -766,7 +767,7 @@ int webserver::build_request_args (
             mr->dhr->querystring += string(buf);
         }
     }
-    int size = internal_unescaper((void*) mr->ws, (char*) value);
+    int size = internal_unescaper((void*) mr->ws, value);
     mr->dhr->set_arg(key, string(value, size));
     return MHD_YES;
 }
@@ -820,6 +821,8 @@ size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s)
 
 size_t internal_unescaper(void* cls, char* s)
 {
+    if(strlen(s) == 0) return 0;
+
     webserver* dws = static_cast<webserver*>(cls);
     if(dws->unescaper != 0x0)
     {
diff --git a/test/basic.cpp b/test/basic.cpp
@@ -21,7 +21,7 @@ size_t headerfunc(void *ptr, size_t size, size_t nmemb, map<string, string>* ss)
     string s_ptr((char*)ptr, size*nmemb);
     size_t pos = s_ptr.find(":");
     if(pos != string::npos)
-        (*ss)[s_ptr.substr(0, pos)] = 
+        (*ss)[s_ptr.substr(0, pos)] =
             s_ptr.substr(pos + 2, s_ptr.size() - pos - 4);
     return size*nmemb;
 }
@@ -276,6 +276,19 @@ LT_BEGIN_AUTO_TEST(basic_suite, postprocessor)
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(postprocessor)
 
+LT_BEGIN_AUTO_TEST(basic_suite, empty_arg)
+    simple_resource* resource = new simple_resource();
+    ws->register_resource("base", resource);
+    curl_global_init(CURL_GLOBAL_ALL);
+    CURL *curl = curl_easy_init();
+    CURLcode res;
+    curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/base");
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "arg1");
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    curl_easy_cleanup(curl);
+LT_END_AUTO_TEST(empty_arg)
 
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()

Original file line number	Diff line number	Diff line change
`@@ -749,10 +749,11 @@ int webserver::build_request_args (`
`749`	`749`	`void *cls,`
`750`	`750`	`enum MHD_ValueKind kind,`
`751`	`751`	`const char *key,`
`752`		`- const char *value`
	`752`	`+ const char *arg_value`
`753`	`753`	`)`
`754`	`754`	`{`
`755`	`755`	`details::modded_request* mr = static_cast<details::modded_request*>(cls);`
	`756`	`+ char* value = (char*) ((arg_value == NULL) ? "" : arg_value);`
`756`	`757`	`{`
`757`	`758`	`char buf[strlen(key) + strlen(value) + 3];`
`758`	`759`	`if(mr->dhr->querystring == "")`
`@@ -766,7 +767,7 @@ int webserver::build_request_args (`
`766`	`767`	`mr->dhr->querystring += string(buf);`
`767`	`768`	`}`
`768`	`769`	`}`
`769`		`- int size = internal_unescaper((void) mr->ws, (char) value);`
	`770`	`+ int size = internal_unescaper((void*) mr->ws, value);`
`770`	`771`	`mr->dhr->set_arg(key, string(value, size));`
`771`	`772`	`return MHD_YES;`
`772`	`773`	`}`
`@@ -820,6 +821,8 @@ size_t unescaper_func(void * cls, struct MHD_Connection c, char s)`
`820`	`821`
`821`	`822`	`size_t internal_unescaper(void* cls, char* s)`
`822`	`823`	`{`
	`824`	`+ if(strlen(s) == 0) return 0;`
	`825`	`+`
`823`	`826`	`webserver* dws = static_cast<webserver*>(cls);`
`824`	`827`	`if(dws->unescaper != 0x0)`
`825`	`828`	`{`