[C][Client]Fix the defect of data lost when libcurl write-data callba…

…ck function (configured by CURLOPT_WRITEFUNCTION) is called multiple times.

modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache

@@ -373,7 +373,9 @@ end:
     {{/returnTypeIsPrimitive}}
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
     {{#hasQueryParams}}list_free(localVarQueryParameters);{{/hasQueryParams}}
     {{#hasHeaderParams}}list_free(localVarHeaderParameters);{{/hasHeaderParams}}
     {{#hasFormParams}}list_free(localVarFormParameters);{{/hasFormParams}}
@@ -463,7 +465,9 @@ end:
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
     {{#hasQueryParams}}list_free(localVarQueryParameters);{{/hasQueryParams}}
     {{#hasHeaderParams}}list_free(localVarHeaderParameters);{{/hasHeaderParams}}
     {{#hasFormParams}}list_free(localVarFormParameters);{{/hasFormParams}}

modules/openapi-generator/src/main/resources/C-libcurl/apiClient.c.mustache

@@ -15,6 +15,7 @@ apiClient_t *apiClient_create() {
     apiClient->basePath = strdup("{{{basePath}}}");
     apiClient->sslConfig = NULL;
     apiClient->dataReceived = NULL;
+    apiClient->dataReceivedLen = 0;
     apiClient->response_code = 0;
     {{#hasAuthMethods}}
     {{#authMethods}}
@@ -59,6 +60,7 @@ apiClient_t *apiClient_create_with_base_path(const char *basePath
     }
 
     apiClient->dataReceived = NULL;
+    apiClient->dataReceivedLen = 0;
     apiClient->response_code = 0;
     {{#hasAuthMethods}}
     {{#authMethods}}
@@ -469,7 +471,7 @@ void apiClient_invoke(apiClient_t    *apiClient,
                          writeDataCallback);
         curl_easy_setopt(handle,
                          CURLOPT_WRITEDATA,
-                         &apiClient->dataReceived);
+                         apiClient);
         curl_easy_setopt(handle, CURLOPT_HTTPHEADER, headers);
         curl_easy_setopt(handle, CURLOPT_VERBOSE, 0); // to get curl debug msg 0: to disable, 1L:to enable
 
@@ -559,9 +561,12 @@ void apiClient_invoke(apiClient_t    *apiClient,
 }
 
 size_t writeDataCallback(void *buffer, size_t size, size_t nmemb, void *userp) {
-    *(char **) userp = strdup(buffer);
-
-    return size * nmemb;
+    size_t size_this_time = nmemb * size;
+    apiClient_t *apiClient = (apiClient_t *)userp;
+    apiClient->dataReceived = (char *)realloc( apiClient->dataReceived, apiClient->dataReceivedLen + size_this_time + 1);
+    memcpy(apiClient->dataReceived + apiClient->dataReceivedLen, buffer, size_this_time);
+    apiClient->dataReceivedLen += size_this_time;
+    return size_this_time;
 }
 
 char *strReplace(char *orig, char *rep, char *with) {

modules/openapi-generator/src/main/resources/C-libcurl/apiClient.h.mustache

@@ -21,6 +21,7 @@ typedef struct apiClient_t {
     char *basePath;
     sslConfig_t *sslConfig;
     void *dataReceived;
+    long dataReceivedLen;
     long response_code;
     {{#hasAuthMethods}}
     {{#authMethods}}

samples/client/petstore/c/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/c/api/PetAPI.c

@@ -102,7 +102,9 @@ PetAPI_addPet(apiClient_t *apiClient, pet_t * body )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -176,7 +178,9 @@ PetAPI_deletePet(apiClient_t *apiClient, long petId , char * api_key )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
     list_free(localVarHeaderParameters);
 
@@ -256,7 +260,9 @@ PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status )
     //return type
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
     list_free(localVarQueryParameters);
 
 
@@ -335,7 +341,9 @@ PetAPI_findPetsByTags(apiClient_t *apiClient, list_t * tags )
     //return type
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
     list_free(localVarQueryParameters);
 
 
@@ -415,7 +423,9 @@ PetAPI_getPetById(apiClient_t *apiClient, long petId )
     //return type
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -482,7 +492,9 @@ PetAPI_updatePet(apiClient_t *apiClient, pet_t * body )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -569,7 +581,9 @@ PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId , char * name , char
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
     list_free(localVarFormParameters);
@@ -669,7 +683,9 @@ PetAPI_uploadFile(apiClient_t *apiClient, long petId , char * additionalMetadata
     //return type
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
     list_free(localVarFormParameters);

samples/client/petstore/c/api/StoreAPI.c

@@ -63,7 +63,9 @@ StoreAPI_deleteOrder(apiClient_t *apiClient, char * orderId )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -121,7 +123,9 @@ StoreAPI_getInventory(apiClient_t *apiClient)
 
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -201,7 +205,9 @@ StoreAPI_getOrderById(apiClient_t *apiClient, long orderId )
     //return type
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -272,7 +278,9 @@ StoreAPI_placeOrder(apiClient_t *apiClient, order_t * body )
     //return type
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 

samples/client/petstore/c/api/UserAPI.c

@@ -59,7 +59,9 @@ UserAPI_createUser(apiClient_t *apiClient, user_t * body )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -136,7 +138,9 @@ UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t * body )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -215,7 +219,9 @@ UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -280,7 +286,9 @@ UserAPI_deleteUser(apiClient_t *apiClient, char * username )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -352,7 +360,9 @@ UserAPI_getUserByName(apiClient_t *apiClient, char * username )
     //return type
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -432,7 +442,9 @@ UserAPI_loginUser(apiClient_t *apiClient, char * username , char * password )
 
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
     list_free(localVarQueryParameters);
 
 
@@ -505,7 +517,9 @@ UserAPI_logoutUser(apiClient_t *apiClient)
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 
@@ -575,7 +589,9 @@ UserAPI_updateUser(apiClient_t *apiClient, char * username , user_t * body )
 end:
     if (apiClient->dataReceived) {
         free(apiClient->dataReceived);
+        apiClient->dataReceived = NULL;
     }
+    apiClient->dataReceivedLen = 0;
 
 
 

samples/client/petstore/c/include/apiClient.h

@@ -21,6 +21,7 @@ typedef struct apiClient_t {
     char *basePath;
     sslConfig_t *sslConfig;
     void *dataReceived;
+    long dataReceivedLen;
     long response_code;
     list_t *apiKeys;
     char *accessToken;

samples/client/petstore/c/src/apiClient.c

@@ -15,6 +15,7 @@ apiClient_t *apiClient_create() {
     apiClient->basePath = strdup("http://petstore.swagger.io/v2");
     apiClient->sslConfig = NULL;
     apiClient->dataReceived = NULL;
+    apiClient->dataReceivedLen = 0;
     apiClient->response_code = 0;
     apiClient->apiKeys = NULL;
     apiClient->accessToken = NULL;
@@ -41,6 +42,7 @@ apiClient_t *apiClient_create_with_base_path(const char *basePath
     }
 
     apiClient->dataReceived = NULL;
+    apiClient->dataReceivedLen = 0;
     apiClient->response_code = 0;
     if(apiKeys!= NULL) {
         apiClient->apiKeys = list_create();
@@ -417,7 +419,7 @@ void apiClient_invoke(apiClient_t    *apiClient,
                          writeDataCallback);
         curl_easy_setopt(handle,
                          CURLOPT_WRITEDATA,
-                         &apiClient->dataReceived);
+                         apiClient);
         curl_easy_setopt(handle, CURLOPT_HTTPHEADER, headers);
         curl_easy_setopt(handle, CURLOPT_VERBOSE, 0); // to get curl debug msg 0: to disable, 1L:to enable
 
@@ -465,9 +467,12 @@ void apiClient_invoke(apiClient_t    *apiClient,
 }
 
 size_t writeDataCallback(void *buffer, size_t size, size_t nmemb, void *userp) {
-    *(char **) userp = strdup(buffer);
-
-    return size * nmemb;
+    size_t size_this_time = nmemb * size;
+    apiClient_t *apiClient = (apiClient_t *)userp;
+    apiClient->dataReceived = (char *)realloc( apiClient->dataReceived, apiClient->dataReceivedLen + size_this_time + 1);
+    memcpy(apiClient->dataReceived + apiClient->dataReceivedLen, buffer, size_this_time);
+    apiClient->dataReceivedLen += size_this_time;
+    return size_this_time;
 }
 
 char *strReplace(char *orig, char *rep, char *with) {
@@ -522,7 +527,7 @@ char *strReplace(char *orig, char *rep, char *with) {
     return result;
 }
 
-char *sbi_base64encode (const void *b64_encode_this, int encode_this_many_bytes){
+char *base64encode (const void *b64_encode_this, int encode_this_many_bytes){
 #ifdef OPENSSL
     BIO *b64_bio, *mem_bio;      //Declares two OpenSSL BIOs: a base64 filter and a memory BIO.
     BUF_MEM *mem_bio_mem_ptr;    //Pointer to a "memory BIO" structure holding our base64 data.
@@ -541,7 +546,7 @@ char *sbi_base64encode (const void *b64_encode_this, int encode_this_many_bytes)
 #endif
 }
 
-char *sbi_base64decode (const void *b64_decode_this, int decode_this_many_bytes){
+char *base64decode (const void *b64_decode_this, int decode_this_many_bytes, int *decoded_bytes){
 #ifdef OPENSSL
     BIO *b64_bio, *mem_bio;      //Declares two OpenSSL BIOs: a base64 filter and a memory BIO.
     char *base64_decoded = calloc( (decode_this_many_bytes*3)/4+1, sizeof(char) ); //+1 = null.
@@ -555,6 +560,7 @@ char *sbi_base64decode (const void *b64_decode_this, int decode_this_many_bytes)
         decoded_byte_index++; //Increment the index until read of BIO decoded data is complete.
     } //Once we're done reading decoded data, BIO_read returns -1 even though there's no error.
     BIO_free_all(b64_bio);  //Destroys all BIOs in chain, starting with b64 (i.e. the 1st one).
+    *decoded_bytes = decoded_byte_index;
     return base64_decoded;        //Returns base-64 decoded data with trailing null terminator.
 #endif
 }