]> granicus.if.org Git - php/commitdiff
fix #35692(iconv_mime_decode() segfault, with libiconv only)
authorAntony Dovgal <tony2001@php.net>
Thu, 15 Dec 2005 22:47:27 +0000 (22:47 +0000)
committerAntony Dovgal <tony2001@php.net>
Thu, 15 Dec 2005 22:47:27 +0000 (22:47 +0000)
ext/iconv/iconv.c

index 191ea75baff65dcb3a2c701bcb3d54768f870552..6c40574d156325e48714e3575bada6211bf67bca 100644 (file)
@@ -1369,7 +1369,7 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st
 
                                        if (cd == (iconv_t)(-1)) {
                                                if ((mode & PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR)) {
-                                                       err = _php_iconv_appendl(pretval, encoded_word, (size_t)((p1 + 1) - encoded_word), cd); 
+                                                       err = _php_iconv_appendl(pretval, encoded_word, (size_t)((p1 + 1) - encoded_word), cd_pl); 
                                                        if (err != PHP_ICONV_ERR_SUCCESS) {
                                                                goto out;
                                                        }