[C][Client][Clang Static Analyzer] Fix memory leak in apiClient_invoke (#7285)

ityuhui · web-flow · commit 1852f61f3ace · 2020-08-25T11:16:19.000+08:00
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/apiClient.c.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/apiClient.c.mustache
@@ -300,6 +300,8 @@ void apiClient_invoke(apiClient_t    *apiClient,
                             (char *) listEntry->data);
                     headers = curl_slist_append(headers,
                                                 buffContent);
+                    free(buffContent);
+                    buffContent = NULL;
                 }
             }
         } else {
@@ -313,8 +315,8 @@ void apiClient_invoke(apiClient_t    *apiClient,
         }
 
         if(formParameters != NULL) {
-            if(strstr(buffContent,
-                      "application/x-www-form-urlencoded") != NULL)
+            if(contentType &&
+               findStrInStrList(contentType, "application/x-www-form-urlencoded") != NULL)
             {
                 long parameterLength = 0;
                 long keyPairLength = 0;
@@ -356,7 +358,8 @@ void apiClient_invoke(apiClient_t    *apiClient,
                 curl_easy_setopt(handle, CURLOPT_POSTFIELDS,
                                  formString);
             }
-            if(strstr(buffContent, "multipart/form-data") != NULL) {
+            if(contentType &&
+               findStrInStrList(contentType, "multipart/form-data") != NULL) {
                 mime = curl_mime_init(handle);
                 list_ForEach(listEntry, formParameters) {
                     keyValuePair_t *keyValuePair =
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/list.c.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/list.c.mustache
@@ -1,6 +1,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "../include/list.h"
 static listEntry_t *listEntry_create(void *data) {
@@ -166,3 +167,19 @@ listEntry_t *list_getElementAt(list_t *list, long indexOfElement) {
         return currentListEntry;
     }
 }
+
+char* findStrInStrList(list_t *strList, const char *str)
+{
+    if (!strList || !str) {
+        return NULL;
+    }
+
+    listEntry_t* listEntry = NULL;
+    list_ForEach(listEntry, strList) {
+        if (strstr((char*)listEntry->data, str) != NULL) {
+            return (char*)listEntry->data;
+        }
+    }
+
+    return NULL;
+}
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/list.h.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/list.h.mustache
@@ -36,4 +36,6 @@ void list_iterateThroughListBackward(list_t* list, void (*operationToPerform)(li
 
 void listEntry_printAsInt(listEntry_t* listEntry, void *additionalData);
 void listEntry_free(listEntry_t *listEntry, void *additionalData);
+
+char* findStrInStrList(list_t* strList, const char* str);
 #endif // INCLUDE_LIST_H
diff --git a/samples/client/petstore/c/include/list.h b/samples/client/petstore/c/include/list.h
@@ -36,4 +36,6 @@ void list_iterateThroughListBackward(list_t* list, void (*operationToPerform)(li
 
 void listEntry_printAsInt(listEntry_t* listEntry, void *additionalData);
 void listEntry_free(listEntry_t *listEntry, void *additionalData);
+
+char* findStrInStrList(list_t* strList, const char* str);
 #endif // INCLUDE_LIST_H
diff --git a/samples/client/petstore/c/src/apiClient.c b/samples/client/petstore/c/src/apiClient.c
@@ -254,6 +254,8 @@ void apiClient_invoke(apiClient_t    *apiClient,
                             (char *) listEntry->data);
                     headers = curl_slist_append(headers,
                                                 buffContent);
+                    free(buffContent);
+                    buffContent = NULL;
                 }
             }
         } else {
@@ -267,8 +269,8 @@ void apiClient_invoke(apiClient_t    *apiClient,
         }
 
         if(formParameters != NULL) {
-            if(strstr(buffContent,
-                      "application/x-www-form-urlencoded") != NULL)
+            if(contentType &&
+               findStrInStrList(contentType, "application/x-www-form-urlencoded") != NULL)
             {
                 long parameterLength = 0;
                 long keyPairLength = 0;
@@ -310,7 +312,8 @@ void apiClient_invoke(apiClient_t    *apiClient,
                 curl_easy_setopt(handle, CURLOPT_POSTFIELDS,
                                  formString);
             }
-            if(strstr(buffContent, "multipart/form-data") != NULL) {
+            if(contentType &&
+               findStrInStrList(contentType, "multipart/form-data") != NULL) {
                 mime = curl_mime_init(handle);
                 list_ForEach(listEntry, formParameters) {
                     keyValuePair_t *keyValuePair =
diff --git a/samples/client/petstore/c/src/list.c b/samples/client/petstore/c/src/list.c
@@ -1,6 +1,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "../include/list.h"
 static listEntry_t *listEntry_create(void *data) {
@@ -166,3 +167,19 @@ listEntry_t *list_getElementAt(list_t *list, long indexOfElement) {
         return currentListEntry;
     }
 }
+
+char* findStrInStrList(list_t *strList, const char *str)
+{
+    if (!strList || !str) {
+        return NULL;
+    }
+
+    listEntry_t* listEntry = NULL;
+    list_ForEach(listEntry, strList) {
+        if (strstr((char*)listEntry->data, str) != NULL) {
+            return (char*)listEntry->data;
+        }
+    }
+
+    return NULL;
+}

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,8 @@ void apiClient_invoke(apiClient_t *apiClient,`
`300`	`300`	`(char *) listEntry->data);`
`301`	`301`	`headers = curl_slist_append(headers,`
`302`	`302`	`buffContent);`
	`303`	`+ free(buffContent);`
	`304`	`+ buffContent = NULL;`
`303`	`305`	`}`
`304`	`306`	`}`
`305`	`307`	`} else {`
`@@ -313,8 +315,8 @@ void apiClient_invoke(apiClient_t *apiClient,`
`313`	`315`	`}`
`314`	`316`
`315`	`317`	`if(formParameters != NULL) {`
`316`		`- if(strstr(buffContent,`
`317`		`- "application/x-www-form-urlencoded") != NULL)`
	`318`	`+ if(contentType &&`
	`319`	`+ findStrInStrList(contentType, "application/x-www-form-urlencoded") != NULL)`
`318`	`320`	`{`
`319`	`321`	`long parameterLength = 0;`
`320`	`322`	`long keyPairLength = 0;`
`@@ -356,7 +358,8 @@ void apiClient_invoke(apiClient_t *apiClient,`
`356`	`358`	`curl_easy_setopt(handle, CURLOPT_POSTFIELDS,`
`357`	`359`	`formString);`
`358`	`360`	`}`
`359`		`- if(strstr(buffContent, "multipart/form-data") != NULL) {`
	`361`	`+ if(contentType &&`
	`362`	`+ findStrInStrList(contentType, "multipart/form-data") != NULL) {`
`360`	`363`	`mime = curl_mime_init(handle);`
`361`	`364`	`list_ForEach(listEntry, formParameters) {`
`362`	`365`	`keyValuePair_t *keyValuePair =`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,8 @@ void apiClient_invoke(apiClient_t *apiClient,`
`254`	`254`	`(char *) listEntry->data);`
`255`	`255`	`headers = curl_slist_append(headers,`
`256`	`256`	`buffContent);`
	`257`	`+ free(buffContent);`
	`258`	`+ buffContent = NULL;`
`257`	`259`	`}`
`258`	`260`	`}`
`259`	`261`	`} else {`
`@@ -267,8 +269,8 @@ void apiClient_invoke(apiClient_t *apiClient,`
`267`	`269`	`}`
`268`	`270`
`269`	`271`	`if(formParameters != NULL) {`
`270`		`- if(strstr(buffContent,`
`271`		`- "application/x-www-form-urlencoded") != NULL)`
	`272`	`+ if(contentType &&`
	`273`	`+ findStrInStrList(contentType, "application/x-www-form-urlencoded") != NULL)`
`272`	`274`	`{`
`273`	`275`	`long parameterLength = 0;`
`274`	`276`	`long keyPairLength = 0;`
`@@ -310,7 +312,8 @@ void apiClient_invoke(apiClient_t *apiClient,`
`310`	`312`	`curl_easy_setopt(handle, CURLOPT_POSTFIELDS,`
`311`	`313`	`formString);`
`312`	`314`	`}`
`313`		`- if(strstr(buffContent, "multipart/form-data") != NULL) {`
	`315`	`+ if(contentType &&`
	`316`	`+ findStrInStrList(contentType, "multipart/form-data") != NULL) {`
`314`	`317`	`mime = curl_mime_init(handle);`
`315`	`318`	`list_ForEach(listEntry, formParameters) {`
`316`	`319`	`keyValuePair_t *keyValuePair =`