From: Antony Dovgal <tony2001@php.net>
Date: Thu, 15 Dec 2005 22:47:27 +0000 (+0000)
Subject: fix #35692(iconv_mime_decode() segfault, with libiconv only)
X-Git-Tag: RELEASE_1_0_4~374
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1518ba3bf7d842a70d2f21b8bce054e38ba7ac44;p=php

fix #35692(iconv_mime_decode() segfault, with libiconv only)
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 191ea75baf..6c40574d15 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -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;
 							}