Cleaned some code in order to avoid unuseful malloc and new.

Sebastiano Merlino · Sebastiano Merlino · commit 888350dece2f · 2012-05-19T23:27:33.000+02:00
diff --git a/src/HttpUtils.cpp b/src/HttpUtils.cpp
@@ -184,30 +184,25 @@ std::string HttpUtils::standardizeUrl(const std::string& url)
 
 std::string get_ip_str(const struct sockaddr *sa, socklen_t maxlen)
 {
-    char* to_ret;
+    char to_ret[INET6_ADDRSTRLEN] = { '\0' };
     switch(sa->sa_family) 
     {
         case AF_INET:
             if(maxlen == 0)
                 maxlen = INET_ADDRSTRLEN;
-            to_ret = (char*)malloc(maxlen*sizeof(char));
             inet_ntop(AF_INET, &(((struct sockaddr_in *)sa)->sin_addr), to_ret, maxlen);
             break;
 
         case AF_INET6:
             if(maxlen == 0)
                 maxlen = INET6_ADDRSTRLEN;
-            to_ret = (char*)malloc(maxlen*sizeof(char));
             inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)sa)->sin6_addr), to_ret, maxlen);
             break;
         default:
-            to_ret = (char*)malloc(11*sizeof(char));
             strncpy(to_ret, "Unknown AF", 11);
             return NULL;
     }
-    std::string res(to_ret);
-    free(to_ret);
-    return std::string(res);
+    return to_ret;
 }
 
 const struct sockaddr str_to_ip(const std::string& src)
diff --git a/src/Webserver.cpp b/src/Webserver.cpp
@@ -623,7 +623,8 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,
     string st_url = HttpUtils::standardizeUrl(url);
 
     mr = (struct ModdedRequest*) *con_cls;
-    access_log(dws, *(mr->completeUri) + " METHOD: " + method);
+    if(mr->second == false)
+        access_log(dws, *(mr->completeUri) + " METHOD: " + method);
     mr->ws = dws;
     if (0 == strcmp (method, MHD_HTTP_METHOD_POST) || 0 == strcmp(method, MHD_HTTP_METHOD_PUT)) 
     {
@@ -712,9 +713,6 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,
     }
     HttpEndpoint endpoint = HttpEndpoint(st_url);
     HttpResponse dhrs;
-    void* page;
-    size_t size = 0;
-    bool to_free = false;
     const HttpEndpoint* matchingEndpoint = 0x0;
     if(!(dws->registeredResources.count(endpoint) > 0)) 
     {
@@ -789,23 +787,22 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,
     }
     else if(dhrs.responseType == HttpResponse::SWITCH_PROTOCOL)
     {
-        response = MHD_create_response_for_upgrade(&upgrade_handler, (void*)dhrs.getSwitchCallback());
+    //    response = MHD_create_response_for_upgrade(&upgrade_handler, (void*)dhrs.getSwitchCallback());
     }
     else
     {
         if(dhrs.content != "")
         {
             vector<char> v_page(dhrs.content.begin(), dhrs.content.end());
-            size = v_page.size();
-            page = (void*) malloc(size*sizeof(char));
-            memcpy( page, &v_page[0], sizeof( char ) * size );
-            to_free = true;
+            size_t size = v_page.size();
+            char page[size];
+            memcpy( (char*) page, &v_page[0], sizeof( char ) * size );
+            response = MHD_create_response_from_buffer(size, page, MHD_RESPMEM_MUST_COPY);
         }
         else
         {
-            page = (void*)"";
+            response = MHD_create_response_from_buffer(0, (void*)"", MHD_RESPMEM_MUST_COPY);
         }
-        response = MHD_create_response_from_buffer(size, page, MHD_RESPMEM_MUST_COPY);
     }
     vector<pair<string,string> > response_headers = dhrs.getHeaders();
     vector<pair<string,string> > response_footers = dhrs.getFooters();
@@ -829,8 +826,6 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,
     if (digestedUser != 0x0)
         free (digestedUser);
     MHD_destroy_response (response);
-    if(to_free)
-        free(page);
     return to_ret;
 }
 
diff --git a/src/string_utilities.cpp b/src/string_utilities.cpp
@@ -73,14 +73,12 @@ std::string regex_replace(std::string str, std::string pattern, std::string repl
     regcomp(&preg, pattern.c_str(), REG_EXTENDED|REG_ICASE);
     if ( regexec(&preg, str.c_str(), 1, substmatch, 0) == 0 )
     {
-        //fprintf(stderr, "%d, %d\n", substmatch[0].rm_so, substmatch[0].rm_eo);
-        char *ns = (char*)malloc(substmatch[0].rm_so + 1 + replace_str.size() + (str.size() - substmatch[0].rm_eo) + 2);
+        char ns[substmatch[0].rm_so + 1 + replace_str.size() + (str.size() - substmatch[0].rm_eo) + 2];
         memcpy(ns, str.c_str(), substmatch[0].rm_so+1);
         memcpy(&ns[substmatch[0].rm_so], replace_str.c_str(), replace_str.size());
         memcpy(&ns[substmatch[0].rm_so+replace_str.size()], &str[substmatch[0].rm_eo], strlen(&str[substmatch[0].rm_eo]));
         ns[ substmatch[0].rm_so + replace_str.size() + strlen(&str[substmatch[0].rm_eo]) ] = 0;
-        to_ret = std::string(ns);
-        free(ns); 
+        to_ret = std::string((char*)ns);
     } 
     regfree(&preg);
     return to_ret;

Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,8 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,`
`623`	`623`	`string st_url = HttpUtils::standardizeUrl(url);`
`624`	`624`
`625`	`625`	`mr = (struct ModdedRequest) con_cls;`
`626`		`- access_log(dws, *(mr->completeUri) + " METHOD: " + method);`
	`626`	`+ if(mr->second == false)`
	`627`	`+ access_log(dws, *(mr->completeUri) + " METHOD: " + method);`
`627`	`628`	`mr->ws = dws;`
`628`	`629`	`if (0 == strcmp (method, MHD_HTTP_METHOD_POST) \|\| 0 == strcmp(method, MHD_HTTP_METHOD_PUT))`
`629`	`630`	`{`
`@@ -712,9 +713,6 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,`
`712`	`713`	`}`
`713`	`714`	`HttpEndpoint endpoint = HttpEndpoint(st_url);`
`714`	`715`	`HttpResponse dhrs;`
`715`		`- void* page;`
`716`		`- size_t size = 0;`
`717`		`- bool to_free = false;`
`718`	`716`	`const HttpEndpoint* matchingEndpoint = 0x0;`
`719`	`717`	`if(!(dws->registeredResources.count(endpoint) > 0))`
`720`	`718`	`{`
`@@ -789,23 +787,22 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,`
`789`	`787`	`}`
`790`	`788`	`else if(dhrs.responseType == HttpResponse::SWITCH_PROTOCOL)`
`791`	`789`	`{`
`792`		`- response = MHD_create_response_for_upgrade(&upgrade_handler, (void*)dhrs.getSwitchCallback());`
	`790`	`+ // response = MHD_create_response_for_upgrade(&upgrade_handler, (void*)dhrs.getSwitchCallback());`
`793`	`791`	`}`
`794`	`792`	`else`
`795`	`793`	`{`
`796`	`794`	`if(dhrs.content != "")`
`797`	`795`	`{`
`798`	`796`	`vector<char> v_page(dhrs.content.begin(), dhrs.content.end());`
`799`		`- size = v_page.size();`
`800`		`- page = (void) malloc(sizesizeof(char));`
`801`		`- memcpy( page, &v_page[0], sizeof( char ) * size );`
`802`		`- to_free = true;`
	`797`	`+ size_t size = v_page.size();`
	`798`	`+ char page[size];`
	`799`	`+ memcpy( (char) page, &v_page[0], sizeof( char ) size );`
	`800`	`+ response = MHD_create_response_from_buffer(size, page, MHD_RESPMEM_MUST_COPY);`
`803`	`801`	`}`
`804`	`802`	`else`
`805`	`803`	`{`
`806`		`- page = (void*)"";`
	`804`	`+ response = MHD_create_response_from_buffer(0, (void*)"", MHD_RESPMEM_MUST_COPY);`
`807`	`805`	`}`
`808`		`- response = MHD_create_response_from_buffer(size, page, MHD_RESPMEM_MUST_COPY);`
`809`	`806`	`}`
`810`	`807`	`vector<pair<string,string> > response_headers = dhrs.getHeaders();`
`811`	`808`	`vector<pair<string,string> > response_footers = dhrs.getFooters();`
`@@ -829,8 +826,6 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,`
`829`	`826`	`if (digestedUser != 0x0)`
`830`	`827`	`free (digestedUser);`
`831`	`828`	`MHD_destroy_response (response);`
`832`		`- if(to_free)`
`833`		`- free(page);`
`834`	`829`	`return to_ret;`
`835`	`830`	`}`
`836`	`831`