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

make sure that converters are not equal to utf8 & ascii before destroying them, or we may end up with double free

Browse source
This commit is contained in:
Antony Dovgal 2008-05-20 15:03:13 +00:00
parent 7de1c81af0
commit bdaa1fe47f
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Zend/zend.c
View file

@ -1004,19 +1004,29 @@ static void unicode_globals_dtor(zend_unicode_globals *unicode_globals TSRMLS_DC
if (unicode_globals->root_search) { if (unicode_globals->root_search) {
usearch_close(unicode_globals->root_search); usearch_close(unicode_globals->root_search);
} }
if (unicode_globals->fallback_encoding_conv) { if (unicode_globals->fallback_encoding_conv &&
unicode_globals->fallback_encoding_conv != unicode_globals->utf8_conv &&
unicode_globals->fallback_encoding_conv != unicode_globals->ascii_conv) {
ucnv_close(unicode_globals->fallback_encoding_conv); ucnv_close(unicode_globals->fallback_encoding_conv);
} }
if (unicode_globals->runtime_encoding_conv) { if (unicode_globals->runtime_encoding_conv &&
unicode_globals->runtime_encoding_conv != unicode_globals->utf8_conv &&
unicode_globals->runtime_encoding_conv != unicode_globals->ascii_conv) {
ucnv_close(unicode_globals->runtime_encoding_conv); ucnv_close(unicode_globals->runtime_encoding_conv);
} }
if (unicode_globals->output_encoding_conv) { if (unicode_globals->output_encoding_conv &&
unicode_globals->output_encoding_conv != unicode_globals->utf8_conv &&
unicode_globals->output_encoding_conv != unicode_globals->ascii_conv) {
ucnv_close(unicode_globals->output_encoding_conv); ucnv_close(unicode_globals->output_encoding_conv);
} }
if (unicode_globals->script_encoding_conv) { if (unicode_globals->script_encoding_conv &&
unicode_globals->script_encoding_conv != unicode_globals->utf8_conv &&
unicode_globals->script_encoding_conv != unicode_globals->ascii_conv) {
ucnv_close(unicode_globals->script_encoding_conv); ucnv_close(unicode_globals->script_encoding_conv);
} }
if (unicode_globals->http_input_encoding_conv) { if (unicode_globals->http_input_encoding_conv &&
unicode_globals->http_input_encoding_conv != unicode_globals->utf8_conv &&
unicode_globals->http_input_encoding_conv != unicode_globals->ascii_conv) {
ucnv_close(unicode_globals->http_input_encoding_conv); ucnv_close(unicode_globals->http_input_encoding_conv);
} }
if (unicode_globals->utf8_conv) { if (unicode_globals->utf8_conv) {