Skip to content

Add integer overflow checks to URL escape allocation functions #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kodareef5 wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Add integer overflow checks to URL escape allocation functions #615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions server/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2073,7 +2073,11 @@ AP_DECLARE(char *) ap_escape_path_segment_buffer(char *copy, const char *segment

AP_DECLARE(char *) ap_escape_path_segment(apr_pool_t *p, const char *segment)
{
return ap_escape_path_segment_buffer(apr_palloc(p, 3 * strlen(segment) + 1), segment);
apr_size_t len = strlen(segment);
if (len > (APR_SIZE_MAX - 1) / 3) {
abort();
}
return ap_escape_path_segment_buffer(apr_palloc(p, 3 * len + 1), segment);
}

AP_DECLARE(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partial)
Expand All @@ -2082,11 +2086,19 @@ AP_DECLARE(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partia
* Allocate another +1 to allow the caller to add a trailing '/' (see
* comment in 'ap_sub_req_lookup_dirent')
*/
char *copy = apr_palloc(p, 3 * strlen(path) + 3 + 1);
const unsigned char *s = (const unsigned char *)path;
unsigned char *d = (unsigned char *)copy;
apr_size_t len = strlen(path);
char *copy;
const unsigned char *s;
unsigned char *d;
unsigned c;

if (len > (APR_SIZE_MAX - 4) / 3) {
abort();
}
copy = apr_palloc(p, 3 * len + 3 + 1);
s = (const unsigned char *)path;
d = (unsigned char *)copy;

if (!partial) {
const char *colon = ap_strchr_c(path, ':');
const char *slash = ap_strchr_c(path, '/');
Expand Down Expand Up @@ -2133,7 +2145,11 @@ AP_DECLARE(char *) ap_escape_urlencoded_buffer(char *copy, const char *buffer)

AP_DECLARE(char *) ap_escape_urlencoded(apr_pool_t *p, const char *buffer)
{
return ap_escape_urlencoded_buffer(apr_palloc(p, 3 * strlen(buffer) + 1), buffer);
apr_size_t len = strlen(buffer);
if (len > (APR_SIZE_MAX - 1) / 3) {
abort();
}
return ap_escape_urlencoded_buffer(apr_palloc(p, 3 * len + 1), buffer);
}

/* ap_escape_uri is now a macro for os_escape_path */
Expand Down