Skip to content

ext/iconv: add a hardening assertion that char_cnt doesn't underflow #23873

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
DanielEScherzer wants to merge 1 commit into
base: PHP-8.6
Choose a base branch
from
+6 −0
Open

ext/iconv: add a hardening assertion that char_cnt doesn't underflow #23873

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: 6 additions & 0 deletions ext/iconv/iconv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,12 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fn
const unsigned char *p;
size_t nbytes_required;

/* Some agents get confused about what char_cnt is; it will
* be at least 4 at this point; if caller messed up and gave
* too short of a max_line_len that was already caught above
* and handled with PHP_ICONV_ERR_TOO_BIG. */
ZEND_ASSERT(char_cnt >= 4);

smart_str_appendc(pretval, 'Q');
char_cnt--;
smart_str_appendc(pretval, '?');
Expand Down
Loading