From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 10 Sep 2008 23:19:50 +0000 (+0000)
Subject: MFB: Fixed bug #46042 (memory leaks with reflection of
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79d8631feae4eb2849b86c19103f044aaedb3da4;p=php

MFB: Fixed bug #46042 (memory leaks with reflection of
mb_convert_encoding())
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 5b10afe5a9..6f1912dc03 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2961,7 +2961,7 @@ PHP_FUNCTION(mb_convert_encoding)
 			s_free = _from_encodings;
 			break;
 		default:
-			convert_to_string_ex(&arg_old);
+			convert_to_string(arg_old);
 			_from_encodings = Z_STRVAL_P(arg_old);
 			break;
 		}
@@ -3082,7 +3082,7 @@ PHP_FUNCTION(mb_detect_encoding)
 			}
 			break;
 		default:
-			convert_to_string_ex(&encoding_list);
+			convert_to_string(encoding_list);
 			if (!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), Z_STRLEN_P(encoding_list), &list, &size, 0 TSRMLS_CC)) {
 				if (list) {
 					efree(list);