Merge pull request #230 from RachelTucker/issue-229

Sharon Shabtai · web-flow · commit 2b36c5f09faf · 2020-09-24T22:23:57.000+03:00
Issue-229: Memory error after 'Request encountered a 307 redirect'
diff --git a/src/ds3_net.c b/src/ds3_net.c
@@ -588,7 +588,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");
@@ -601,9 +600,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
`@@ -588,7 +588,6 @@ ds3_error* net_process_request(const ds3_client* client,`
`588`	`588`	`}`
`589`	`589`	`ds3_string_multimap_free(response_headers);`
`590`	`590`	`ds3_str_free(response_data.status_message);`
`591`		`- g_free(url);`
`592`	`591`
`593`	`592`	`if (response_data.status_code == 307) {`
`594`	`593`	`ds3_log_message(client->log, DS3_INFO, "Request encountered a 307 redirect");`
`@@ -601,9 +600,11 @@ ds3_error* net_process_request(const ds3_client* client,`
`601`	`600`	`error->message = ds3_str_init("Encountered too many redirects while attempting to fulfill the request");`
`602`	`601`	`error->code = DS3_ERROR_TOO_MANY_REDIRECTS;`
`603`	`602`	`} else {`
	`603`	`+ ds3_error_free(error);`
`604`	`604`	`continue;`
`605`	`605`	`}`
`606`	`606`	`}`
	`607`	`+ g_free(url);`
`607`	`608`	`return error;`
`608`	`609`	`}`
`609`	`610`	`g_byte_array_free(response_data.body, TRUE);`