Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

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

experimental/first_unicode_implementation
Antony Dovgal 18 years ago
parent
7de1c81af0
commit
bdaa1fe47f
1 changed files with 15 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      Zend/zend.c

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) {
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);
}
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);
}
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);
}
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);
}
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);
}
if (unicode_globals->utf8_conv) {

Write Preview
Loading…
Cancel
Save