Merge pull request #6705 from libgit2/ethomson/httpclient

ethomson · web-flow · commit da1e95732578 · 2023-12-21T20:45:58.000Z
httpclient: clear client-&gt;parser.data after use
diff --git a/src/libgit2/transports/httpclient.c b/src/libgit2/transports/httpclient.c
@@ -1252,6 +1252,7 @@ static void complete_response_body(git_http_client *client)
 	}
 
 done:
+	client->parser.data = NULL;
 	git_str_clear(&client->read_buf);
 }
 
@@ -1441,6 +1442,7 @@ int git_http_client_read_response(
 done:
 	git_str_dispose(&parser_context.parse_header_name);
 	git_str_dispose(&parser_context.parse_header_value);
+	client->parser.data = NULL;
 
 	return error;
 }
@@ -1496,6 +1498,8 @@ int git_http_client_read_body(
 	if (error < 0)
 		client->connected = 0;
 
+	client->parser.data = NULL;
+
 	return error;
 }
 
@@ -1530,6 +1534,8 @@ int git_http_client_skip_body(git_http_client *client)
 	if (error < 0)
 		client->connected = 0;
 
+	client->parser.data = NULL;
+
 	return error;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1252,6 +1252,7 @@ static void complete_response_body(git_http_client *client)`
`1252`	`1252`	`}`
`1253`	`1253`
`1254`	`1254`	`done:`
	`1255`	`+ client->parser.data = NULL;`
`1255`	`1256`	`git_str_clear(&client->read_buf);`
`1256`	`1257`	`}`
`1257`	`1258`
`@@ -1441,6 +1442,7 @@ int git_http_client_read_response(`
`1441`	`1442`	`done:`
`1442`	`1443`	`git_str_dispose(&parser_context.parse_header_name);`
`1443`	`1444`	`git_str_dispose(&parser_context.parse_header_value);`
	`1445`	`+ client->parser.data = NULL;`
`1444`	`1446`
`1445`	`1447`	`return error;`
`1446`	`1448`	`}`
`@@ -1496,6 +1498,8 @@ int git_http_client_read_body(`
`1496`	`1498`	`if (error < 0)`
`1497`	`1499`	`client->connected = 0;`
`1498`	`1500`
	`1501`	`+ client->parser.data = NULL;`
	`1502`	`+`
`1499`	`1503`	`return error;`
`1500`	`1504`	`}`
`1501`	`1505`
`@@ -1530,6 +1534,8 @@ int git_http_client_skip_body(git_http_client *client)`
`1530`	`1534`	`if (error < 0)`
`1531`	`1535`	`client->connected = 0;`
`1532`	`1536`
	`1537`	`+ client->parser.data = NULL;`
	`1538`	`+`
`1533`	`1539`	`return error;`
`1534`	`1540`	`}`
`1535`	`1541`