diff options
| author | Yann Ylavic <ylavic@apache.org> | 2020-05-20 16:01:17 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2020-05-20 16:01:17 +0200 |
| commit | 11d03dc86a9642a4af44c40122299b7efad47775 (patch) | |
| tree | 23576af687aa6d5ad87abb8307bb4e3006741f1e /modules/apreq | |
| parent | lognos (diff) | |
| download | apache2-11d03dc86a9642a4af44c40122299b7efad47775.tar.xz apache2-11d03dc86a9642a4af44c40122299b7efad47775.zip | |
core,modules: provide/use ap_parse_strict_length() helper.
It helps simplifying a lot of duplicated code based on apr_strtoff(), while
also rejecting leading plus/minus signs which are dissalowed in Content-Length
and (Content-)Range headers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877954 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/apreq')
| -rw-r--r-- | modules/apreq/filter.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/apreq/filter.c b/modules/apreq/filter.c index d2d8996eda..b4a1a4ebac 100644 --- a/modules/apreq/filter.c +++ b/modules/apreq/filter.c @@ -121,18 +121,16 @@ void apreq_filter_init_context(ap_filter_t *f) } cl_header = apr_table_get(r->headers_in, "Content-Length"); - if (cl_header != NULL) { - char *dummy; - apr_uint64_t content_length = apr_strtoi64(cl_header, &dummy, 10); + apr_off_t cl; - if (dummy == NULL || *dummy != 0) { + if (!ap_parse_strict_length(&cl, cl_header)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_EGENERAL, r, APLOGNO(02045) "Invalid Content-Length header (%s)", cl_header); ctx->body_status = APREQ_ERROR_BADHEADER; return; } - else if (content_length > ctx->read_limit) { + if ((apr_uint64_t)cl > ctx->read_limit) { ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_EGENERAL, r, APLOGNO(02046) "Content-Length header (%s) exceeds configured " "max_body limit (%" APR_UINT64_T_FMT ")", |