diff options
| author | Stefan Eissing <icing@apache.org> | 2022-04-06 09:17:42 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2022-04-06 09:17:42 +0000 |
| commit | a4ea0e7799cc1bb63e5406cd427f09d668cedfae (patch) | |
| tree | 19f8e1015613cafdcb9d35fbe8721eb26e869134 /server | |
| parent | 4e6d9a6618e223b7177c93d4669b01341f24c652 (diff) | |
| download | httpd-a4ea0e7799cc1bb63e5406cd427f09d668cedfae.tar.gz | |
*) core: make ap_escape_quotes() work correctly on strings
with more than MAX_INT/2 characters, counting quotes double.
Credit to <generalbugs@zippenhop.com> for finding this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1899609 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/util.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/server/util.c b/server/util.c index 771ba7b16f..420615a41a 100644 --- a/server/util.c +++ b/server/util.c @@ -2615,7 +2615,7 @@ AP_DECLARE(void) ap_content_type_tolower(char *str) */ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring) { - int newlen = 0; + apr_ssize_t extra = 0; const char *inchr = instring; char *outchr, *outstring; @@ -2624,9 +2624,8 @@ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring) * string up by an extra byte each time we find an unescaped ". */ while (*inchr != '\0') { - newlen++; if (*inchr == '"') { - newlen++; + extra++; } /* * If we find a slosh, and it's not the last byte in the string, @@ -2634,11 +2633,15 @@ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring) */ else if ((*inchr == '\\') && (inchr[1] != '\0')) { inchr++; - newlen++; } inchr++; } - outstring = apr_palloc(p, newlen + 1); + + if (!extra) { + return apr_pstrdup(p, instring); + } + + outstring = apr_palloc(p, (inchr - instring) + extra + 1); inchr = instring; outchr = outstring; /* |