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

In getline() and ap_get_client_block(), use ap_bucket_destroy()

Browse Source 
instead of bucket->destroy().  bucket->destroy() wasn't being
called correctly and also we were leaking the storage for the
bucket itself since bucket->destroy() doesn't free the ap_bucket.
Submitted by:	Ryan Bloom, Jeff Trawick


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

8
modules/http/http_protocol.c
View File

@@ -1007,7 +1007,7 @@ static int getline(char *s, int n, conn_rec *c, int fold)
while (1) { while (1) {
while (e->length == 0) { while (e->length == 0) {
AP_BUCKET_REMOVE(e); AP_BUCKET_REMOVE(e);
e->destroy(e); ap_bucket_destroy(e);
ap_get_brigade(c->input_filters, b); ap_get_brigade(c->input_filters, b);
if (!AP_BRIGADE_EMPTY(b)) { if (!AP_BRIGADE_EMPTY(b)) {
@@ -1034,7 +1034,7 @@ static int getline(char *s, int n, conn_rec *c, int fold)
apr_cpystrn(pos, temp, length + 1); apr_cpystrn(pos, temp, length + 1);
AP_BUCKET_REMOVE(e); AP_BUCKET_REMOVE(e);
e->destroy(e); ap_bucket_destroy(e);
} }
c->input_data = b; c->input_data = b;
e = AP_BRIGADE_FIRST(b); e = AP_BRIGADE_FIRST(b);
@@ -2467,7 +2467,7 @@ API_EXPORT(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
ap_bucket *e = b; ap_bucket *e = b;
b = AP_BUCKET_NEXT(e); b = AP_BUCKET_NEXT(e);
AP_BUCKET_REMOVE(e); AP_BUCKET_REMOVE(e);
e->destroy(e); ap_bucket_destroy(e);
} }
} while (AP_BRIGADE_EMPTY(r->connection->input_data)); } while (AP_BRIGADE_EMPTY(r->connection->input_data));
@@ -2481,7 +2481,7 @@ API_EXPORT(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
memcpy(buffer, tempbuf, len_to_read); memcpy(buffer, tempbuf, len_to_read);
AP_BUCKET_REMOVE(b); AP_BUCKET_REMOVE(b);
b->destroy(b); ap_bucket_destroy(b);
r->read_length += len_to_read; r->read_length += len_to_read;
r->remaining -= len_to_read; r->remaining -= len_to_read;