Merge pull request #493 from RachelTucker/5-0-c-bug

Sharon Shabtai · web-flow · commit 87291e052d0c · 2020-09-24T22:24:56.000+03:00
Fix for C SDK Issue-229
diff --git a/ds3-autogen-c/src/main/resources/templates/other-templates/ds3_net_c.ftl b/ds3-autogen-c/src/main/resources/templates/other-templates/ds3_net_c.ftl
@@ -572,7 +572,6 @@ ds3_error* net_process_request(const ds3_client* client,
                 }
                 ds3_string_multimap_free(response_headers);
                 ds3_str_free(response_data.status_message);
-                g_free(url);
 
                 if (response_data.status_code == 307) {
                     ds3_log_message(client->log, DS3_INFO, "Request encountered a 307 redirect");
@@ -585,9 +584,11 @@ ds3_error* net_process_request(const ds3_client* client,
                         error->message = ds3_str_init("Encountered too many redirects while attempting to fulfill the request");
                         error->code = DS3_ERROR_TOO_MANY_REDIRECTS;
                     } else {
+                        ds3_error_free(error);
                         continue;
                     }
                 }
+                g_free(url);
                 return error;
             }
             g_byte_array_free(response_data.body, TRUE);

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,6 @@ ds3_error* net_process_request(const ds3_client* client,`
`572`	`572`	`}`
`573`	`573`	`ds3_string_multimap_free(response_headers);`
`574`	`574`	`ds3_str_free(response_data.status_message);`
`575`		`- g_free(url);`
`576`	`575`
`577`	`576`	`if (response_data.status_code == 307) {`
`578`	`577`	`ds3_log_message(client->log, DS3_INFO, "Request encountered a 307 redirect");`
`@@ -585,9 +584,11 @@ ds3_error* net_process_request(const ds3_client* client,`
`585`	`584`	`error->message = ds3_str_init("Encountered too many redirects while attempting to fulfill the request");`
`586`	`585`	`error->code = DS3_ERROR_TOO_MANY_REDIRECTS;`
`587`	`586`	`} else {`
	`587`	`+ ds3_error_free(error);`
`588`	`588`	`continue;`
`589`	`589`	`}`
`590`	`590`	`}`
	`591`	`+ g_free(url);`
`591`	`592`	`return error;`
`592`	`593`	`}`
`593`	`594`	`g_byte_array_free(response_data.body, TRUE);`