Skip to content

mod_charset_lite: bound ctx->buf writes in finish_partial_char #679

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
+4 −2
Open

mod_charset_lite: bound ctx->buf writes in finish_partial_char #679

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
6 changes: 4 additions & 2 deletions modules/filters/mod_charset_lite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,8 @@ static apr_status_t finish_partial_char(charset_filter_ctx_t *ctx,
/* Keep adding bytes from the input string to the saved string until we
* 1) finish the input char
* 2) get an error
* or 3) run out of bytes to add
* 3) run out of bytes to add
* or 4) fill ctx->buf, meaning the char is wider than we handle
*/

do {
Expand All @@ -455,7 +456,8 @@ static apr_status_t finish_partial_char(charset_filter_ctx_t *ctx,
&tmp_input_len,
*out_str,
out_len);
} while (rv == APR_INCOMPLETE && *cur_len);
} while (rv == APR_INCOMPLETE && *cur_len
&& ctx->saved < sizeof(ctx->buf));

if (rv == APR_SUCCESS) {
ctx->saved = 0;
Expand Down