Skip to content
Permalink
Browse files

Curl_fillreadbuffer: avoid double-free trailer buf on error

Reviewed-by: Jay Satiro
Reported-by: Thomas Vegas

Closes #4307
  • Loading branch information...
bagder committed Sep 4, 2019
1 parent 74e152f commit c4c9e070f35c113b8b9c4d79ca1b9c1afe87d0e4
Showing with 17 additions and 12 deletions.
  1. +10 −6 lib/http.c
  2. +1 −1 lib/http.h
  3. +6 −5 lib/transfer.c
@@ -1146,10 +1146,14 @@ Curl_send_buffer *Curl_add_buffer_init(void)
*/
void Curl_add_buffer_free(Curl_send_buffer **inp)
{
Curl_send_buffer *in = *inp;
if(in) /* deal with NULL input */
Curl_send_buffer *in;
if(!inp)
return;
in = *inp;
if(in) { /* deal with NULL input */
free(in->buffer);
free(in);
free(in);
}
*inp = NULL;
}

@@ -1720,7 +1724,7 @@ enum proxy_use {
will return an error code if one of the headers is
not formatted correctly */
CURLcode Curl_http_compile_trailers(struct curl_slist *trailers,
Curl_send_buffer *buffer,
Curl_send_buffer **buffer,
struct Curl_easy *handle)
{
char *ptr = NULL;
@@ -1746,7 +1750,7 @@ CURLcode Curl_http_compile_trailers(struct curl_slist *trailers,
/* only add correctly formatted trailers */
ptr = strchr(trailers->data, ':');
if(ptr && *(ptr + 1) == ' ') {
result = Curl_add_bufferf(&buffer, "%s%s", trailers->data,
result = Curl_add_bufferf(buffer, "%s%s", trailers->data,
endofline_native);
if(result)
return result;
@@ -1755,7 +1759,7 @@ CURLcode Curl_http_compile_trailers(struct curl_slist *trailers,
infof(handle, "Malformatted trailing header ! Skipping trailer.");
trailers = trailers->next;
}
result = Curl_add_buffer(&buffer, endofline_network,
result = Curl_add_buffer(buffer, endofline_network,
strlen(endofline_network));
return result;
}
@@ -75,7 +75,7 @@ CURLcode Curl_add_custom_headers(struct connectdata *conn,
bool is_connect,
Curl_send_buffer *req_buffer);
CURLcode Curl_http_compile_trailers(struct curl_slist *trailers,
Curl_send_buffer *buffer,
Curl_send_buffer **buffer,
struct Curl_easy *handle);

/* protocol-specific functions set up to be called by the main engine */
@@ -176,7 +176,7 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, size_t bytes,
#ifndef CURL_DISABLE_HTTP
if(data->state.trailers_state == TRAILERS_INITIALIZED) {
struct curl_slist *trailers = NULL;
CURLcode c;
CURLcode result;
int trailers_ret_code;

/* at this point we already verified that the callback exists
@@ -195,17 +195,18 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, size_t bytes,
data->set.trailer_data);
Curl_set_in_callback(data, false);
if(trailers_ret_code == CURL_TRAILERFUNC_OK) {
c = Curl_http_compile_trailers(trailers, data->state.trailers_buf, data);
result = Curl_http_compile_trailers(trailers, &data->state.trailers_buf,
data);
}
else {
failf(data, "operation aborted by trailing headers callback");
*nreadp = 0;
c = CURLE_ABORTED_BY_CALLBACK;
result = CURLE_ABORTED_BY_CALLBACK;
}
if(c != CURLE_OK) {
if(result) {
Curl_add_buffer_free(&data->state.trailers_buf);
curl_slist_free_all(trailers);
return c;
return result;
}
infof(data, "Successfully compiled trailers.\r\n");
curl_slist_free_all(trailers);

0 comments on commit c4c9e07

Please sign in to comment.
You can’t perform that action at this time.