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

Fix bug #26639 (mb_convert_variables() clutters variables beyond the references)

PEAR_1_4DEV
Moriyoshi Koizumi 22 years ago
parent
749cf47ef7
commit
b8ea4e6fd2
2 changed files with 109 additions and 6 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. 15
      ext/mbstring/mbstring.c
  2. 100
      ext/mbstring/tests/bug26639.phpt

15
ext/mbstring/mbstring.c
View File

@ -2605,9 +2605,13 @@ detect_end:
string.len = Z_STRLEN_PP(hash_entry);
ret = mbfl_buffer_converter_feed_result(convd, &string, &result);
if (ret != NULL) {
STR_FREE(Z_STRVAL_PP(hash_entry));
Z_STRVAL_PP(hash_entry) = (char *)ret->val;
Z_STRLEN_PP(hash_entry) = ret->len;
if ((*hash_entry)->refcount > 1) {
ZVAL_DELREF(*hash_entry);
MAKE_STD_ZVAL(*hash_entry);
} else {
zval_dtor(*hash_entry);
}
ZVAL_STRINGL(*hash_entry, ret->val, ret->len, 0);
}
}
}
@ -2617,9 +2621,8 @@ detect_end:
string.len = Z_STRLEN_PP(var);
ret = mbfl_buffer_converter_feed_result(convd, &string, &result);
if (ret != NULL) {
STR_FREE(Z_STRVAL_PP(var));
Z_STRVAL_PP(var) = (char *)ret->val;
Z_STRLEN_PP(var) = ret->len;
zval_dtor(*var);
ZVAL_STRINGL(*var, ret->val, ret->len, 0);
}
}
}

100
ext/mbstring/tests/bug26639.phpt
View File

@ -0,0 +1,100 @@
--TEST--
Bug #26639 (mb_convert_variables() clutters variables beyond the references)
--SKIPIF--
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
$a = "あいうえお";
$b = $a;
mb_convert_variables("EUC-JP", "Shift_JIS", $b);
debug_zval_dump($a);
debug_zval_dump($b);
unset($a);
unset($b);
$a = "あいうえお";
$b = &$a;
mb_convert_variables("EUC-JP", "Shift_JIS", $b);
debug_zval_dump($a);
debug_zval_dump($b);
unset($a);
unset($b);
$a = "あいうえお";
$b = array($a);
$c = $b;
mb_convert_variables("EUC-JP", "Shift_JIS", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
$a = "あいうえお";
$b = array(&$a);
$c = $b;
mb_convert_variables("euc-jp", "shift_jis", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
$a = "あいうえお";
$b = array($a);
$c = &$b;
mb_convert_variables("euc-jp", "shift_jis", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
$a = "あいうえお";
$b = array(&$a);
$c = &$b;
mb_convert_variables("euc-jp", "shift_jis", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
?>
--EXPECT--
string(10) "あいうえお" refcount(2)
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(2)
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(1)
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(1)
array(1) refcount(2){
[0]=>
string(10) "あいうえお" refcount(2)
}
array(1) refcount(2){
[0]=>
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(1)
}
array(1) refcount(2){
[0]=>
&string(10) "あいうえお" refcount(2)
}
array(1) refcount(2){
[0]=>
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(1)
}
array(1) refcount(1){
[0]=>
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(2)
}
array(1) refcount(1){
[0]=>
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(2)
}
array(1) refcount(1){
[0]=>
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(2)
}
array(1) refcount(1){
[0]=>
string(10) "､｢､､､ｦ､ｨ､ｪ" refcount(2)
}
Write Preview
Loading…
Cancel
Save