Skip to content

fix off-by-one buffer overflow in proxy_send_dir_filter #677

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
arshsmith1 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+9 −3
Open

fix off-by-one buffer overflow in proxy_send_dir_filter #677

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
12 changes: 9 additions & 3 deletions modules/proxy/mod_proxy_ftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,9 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,

{
apr_size_t n = strlen(ctx->buffer);
if (ctx->buffer[n-1] == CRLF[1]) /* strip trailing '\n' */
if (n > 0 && ctx->buffer[n-1] == CRLF[1]) /* strip trailing '\n' */
ctx->buffer[--n] = '\0';
if (ctx->buffer[n-1] == CRLF[0]) /* strip trailing '\r' if present */
if (n > 0 && ctx->buffer[n-1] == CRLF[0]) /* strip trailing '\r' if present */
ctx->buffer[--n] = '\0';
}

Expand Down Expand Up @@ -746,7 +746,13 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,
ap_escape_html(p, filename), "</a>\n", NULL);
}
else {
strcat(ctx->buffer, "\n"); /* re-append the newline */
/* re-append the newline, unless an over-long line already
* filled the buffer up to its last byte */
apr_size_t n = strlen(ctx->buffer);
if (n + 1 < sizeof(ctx->buffer)) {
ctx->buffer[n] = '\n';
ctx->buffer[n + 1] = '\0';
}
str = ap_escape_html(p, ctx->buffer);
}

Expand Down