archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
mb_convert_encoding())
This commit is contained in:
Ilia Alshanetsky 2008-09-10 23:19:50 +00:00
parent da5e36b702
commit 79d8631fea
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mbstring/mbstring.c
View file

@ -2961,7 +2961,7 @@ PHP_FUNCTION(mb_convert_encoding)
s_free = _from_encodings; s_free = _from_encodings;
break; break;
default: default:
convert_to_string_ex(&arg_old); convert_to_string(arg_old);
_from_encodings = Z_STRVAL_P(arg_old); _from_encodings = Z_STRVAL_P(arg_old);
break; break;
} }
@ -3082,7 +3082,7 @@ PHP_FUNCTION(mb_detect_encoding)
} }
break; break;
default: 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 (!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), Z_STRLEN_P(encoding_list), &list, &size, 0 TSRMLS_CC)) {
if (list) { if (list) {
efree(list); efree(list);