diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:07:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:07:43 +0200 |
| commit | 153e292e108f2fcd411ae75a00d3814987ccf17d (patch) | |
| tree | 9253e2d8342e6d0ab256ec6dd0ca90701895bc3c | |
| parent | 6122f67492401e04bab37bd864e3d5f53e6f4a75 (diff) | |
| download | php-git-153e292e108f2fcd411ae75a00d3814987ccf17d.tar.gz | |
Escape trigraph sequence
??= is a trigraph for #, so it needs to be escaped. To stay
consistent I'm escaping all question marks in this literal, even
though one of the latter two would suffice.
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 38a775c9a8..d1b28c122d 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -1224,7 +1224,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fn do { size_t prev_in_left; size_t out_size; - size_t encoded_word_min_len = sizeof("=??X??=")-1 + out_charset_len + (enc_scheme == PHP_ICONV_ENC_SCHEME_BASE64 ? 4 : 3); + size_t encoded_word_min_len = sizeof("=\?\?X\?\?=")-1 + out_charset_len + (enc_scheme == PHP_ICONV_ENC_SCHEME_BASE64 ? 4 : 3); if (char_cnt < encoded_word_min_len + lfchars_len + 1) { /* lfchars must be encoded in ASCII here*/ |