www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

getline() fixes...

Browse Source 
If ap_get_brigade() returns APR_SUCCESS but an empty brigade, bail out.
Previously, we kept going and sometimes segfaulted while operating on
what we thought was the first bucket.

Free the temporary brigade used by getline().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86581 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2000-10-13 17:54:24 +00:00
parent f5ab7f6f10
commit ee1ba0a23f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/http/http_protocol.c
View File

@@ -960,7 +960,9 @@ static int getline(char *s, int n, conn_rec *c, int fold)
while (1) {
if (AP_BRIGADE_EMPTY(b)) {
if (ap_get_brigade(c->input_filters, b, AP_GET_LINE) != APR_SUCCESS) {
if (ap_get_brigade(c->input_filters, b, AP_GET_LINE) != APR_SUCCESS ||
AP_BRIGADE_EMPTY(b)) {
ap_brigade_destroy(b);
return -1;
}
}
@@ -986,6 +988,7 @@ static int getline(char *s, int n, conn_rec *c, int fold)
/* input line was larger than the caller's buffer */
AP_BUCKET_REMOVE(e);
ap_bucket_destroy(e);
ap_brigade_destroy(b);
return -1;
}
@@ -1033,6 +1036,7 @@ static int getline(char *s, int n, conn_rec *c, int fold)
pos++; /* bump past end of incomplete line */
}
}
ap_brigade_destroy(b);
return total;
}