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

* modules/http/http_protocol.c (ap_setup_client_block,

Browse Source 
ap_http_filter): Use new apr_strtoff() to support request bodies as
large as apr_off_t allows (rather than as large as 'long' allows), and
simplify error handling.

PR: 27866


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103756 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2004-05-25 14:36:18 +00:00
parent f10b0ad3dc
commit 2c37f8ffc7
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/http/http_protocol.c
View File

@@ -764,25 +764,19 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
} }
} }
else if (lenp) { else if (lenp) {
int conversion_error = 0;
char *endstr; char *endstr;
ctx->state = BODY_LENGTH; ctx->state = BODY_LENGTH;
errno = 0; errno = 0;
ctx->remaining = strtol(lenp, &endstr, 10); /* we depend on ANSI */
/* Protects against over/underflow, non-digit chars in the
/* This protects us from over/underflow (the errno check), * string (excluding leading space) (the endstr checks)
* non-digit chars in the string (excluding leading space) * and a negative number. */
* (the endstr checks) and a negative number. Depending if (apr_strtoff(&ctx->remaining, lenp, &endstr, 10)
* on the strtol implementation, the errno check may also || *endstr || ctx->remaining < 0) {
* trigger on an all whitespace string */
if (errno || (endstr && *endstr) || (ctx->remaining < 0)) {
conversion_error = 1;
}
if (conversion_error) {
apr_bucket_brigade *bb; apr_bucket_brigade *bb;
ctx->remaining = 0;
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
"Invalid Content-Length"); "Invalid Content-Length");
@@ -1766,18 +1760,11 @@ AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy)
r->read_chunked = 1; r->read_chunked = 1;
} }
else if (lenp) { else if (lenp) {
int conversion_error = 0;
char *endstr; char *endstr;
errno = 0; if (apr_strtoff(&r->remaining, lenp, &endstr, 10)
r->remaining = strtol(lenp, &endstr, 10); /* depend on ANSI */ || *endstr || r->remaining < 0) {
r->remaining = 0;
/* See comments in ap_http_filter() */
if (errno || (endstr && *endstr) || (r->remaining < 0)) {
conversion_error = 1;
}
if (conversion_error) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"Invalid Content-Length"); "Invalid Content-Length");
return HTTP_BAD_REQUEST; return HTTP_BAD_REQUEST;