Re: com php-src: Fixed Bug #66964 mb_convert_variables() cannot detect recursion: ext/mbstring/mbstring.c ext/mbstring/tests/bug66964.phpt

From: Date: Tue, 06 Sep 2016 11:51:17 +0000
Subject: Re: com php-src: Fixed Bug #66964 mb_convert_variables() cannot detect recursion: ext/mbstring/mbstring.c ext/mbstring/tests/bug66964.phpt
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94349@lists.php.net to get a copy of this message
Hi Yasuo! On 06.09.2016 at 09:05, Yasuo Ohgaki wrote: > Commit: a25f6f89cd68b5e3ba73381094771a011aec6f04 > Author: Yasuo Ohgaki <yohgaki@php.net> Tue, 6 Sep 2016 16:05:34 +0900 > Parents: 8aad3131a1d00e191db1b3b27aed6e7fae269f13 > Branches: PHP-5.6 PHP-7.0 PHP-7.1 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=a25f6f89cd68b5e3ba73381094771a011aec6f04 > > Log: > Fixed Bug #66964 mb_convert_variables() cannot detect recursion It appears that after this commit ext/mbstring/tests/bug26639.phpt always fails on PHP-5.6 only, see e.g. <https://travis-ci.org/php/php-src/jobs/157845693>. Possibly only the test case needs to be fixed. Can you please have a look at this issue? Cheers! > Bugs: > https://bugs.php.net/66964 > > Changed paths: > M ext/mbstring/mbstring.c > A ext/mbstring/tests/bug66964.phpt > > > Diff: > diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c > index ee8a009..18e348d 100644 > --- a/ext/mbstring/mbstring.c > +++ b/ext/mbstring/mbstring.c > @@ -3530,7 +3530,8 @@ PHP_FUNCTION(mb_convert_variables) > size_t elistsz; > const mbfl_encoding **elist; > char *to_enc; > - void *ptmp; > + void *ptmp; > + int recursion_error = 0; > > if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ+", &to_enc, > &to_enc_len, &zfrom_enc, &args, &argc) == FAILURE) { > return; > @@ -3593,6 +3594,11 @@ PHP_FUNCTION(mb_convert_variables) > target_hash = HASH_OF(*var); > if (target_hash != NULL) { > while (zend_hash_get_current_data(target_hash, (void **) &hash_entry) != FAILURE) { > + if (++target_hash->nApplyCount > 1) { > + --target_hash->nApplyCount; > + recursion_error = 1; > + goto detect_end; > + } > zend_hash_move_forward(target_hash); > if (Z_TYPE_PP(hash_entry) == IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) { > if (stack_level >= stack_max) { > @@ -3629,6 +3635,20 @@ detect_end: > from_encoding = mbfl_encoding_detector_judge2(identd); > mbfl_encoding_detector_delete(identd); > } > + if (recursion_error) { > + while(stack_level-- && (var = stack[stack_level])) { > + if (HASH_OF(*var)->nApplyCount > 1) { > + HASH_OF(*var)->nApplyCount--; > + } > + } > + efree(stack); > + efree(args); > + if (elist != NULL) { > + efree((void *)elist); > + } > + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive > references"); > + RETURN_FALSE; > + } > efree(stack); > > if (!from_encoding) { > @@ -3676,6 +3696,11 @@ detect_end: > while (zend_hash_get_current_data(target_hash, (void **) &hash_entry) != FAILURE) { > zend_hash_move_forward(target_hash); > if (Z_TYPE_PP(hash_entry) == IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) { > + if (++(HASH_OF(*hash_entry)->nApplyCount) > 1) { > + --(HASH_OF(*hash_entry)->nApplyCount); > + recursion_error = 1; > + goto conv_end; > + } > if (stack_level >= stack_max) { > stack_max += PHP_MBSTR_STACK_BLOCK_SIZE; > ptmp = erealloc(stack, sizeof(zval **)*stack_max); > @@ -3684,7 +3709,6 @@ detect_end: > stack[stack_level] = var; > stack_level++; > var = hash_entry; > - SEPARATE_ZVAL(hash_entry); > target_hash = HASH_OF(*var); > if (target_hash != NULL) { > zend_hash_internal_pointer_reset(target_hash); > @@ -3701,25 +3725,38 @@ detect_end: > } else { > zval_dtor(*hash_entry); > } > - ZVAL_STRINGL(*hash_entry, (char *)ret->val, ret->len, 0); > + ZVAL_STRINGL(*hash_entry, (char *)ret->val, ret->len, 0); > + } > } > } > } > - } > - } else if (Z_TYPE_PP(var) == IS_STRING) { > - string.val = (unsigned char *)Z_STRVAL_PP(var); > - string.len = Z_STRLEN_PP(var); > - ret = mbfl_buffer_converter_feed_result(convd, &string, &result); > - if (ret != NULL) { > - zval_dtor(*var); > - ZVAL_STRINGL(*var, (char *)ret->val, ret->len, 0); > + } else if (Z_TYPE_PP(var) == IS_STRING) { > + string.val = (unsigned char *)Z_STRVAL_PP(var); > + string.len = Z_STRLEN_PP(var); > + ret = mbfl_buffer_converter_feed_result(convd, &string, &result); > + if (ret != NULL) { > + zval_dtor(*var); > + ZVAL_STRINGL(*var, (char *)ret->val, ret->len, 0); > } > } > } > - efree(stack); > > +conv_end: > MBSTRG(illegalchars) += mbfl_buffer_illegalchars(convd); > mbfl_buffer_converter_delete(convd); > + > + if (recursion_error) { > + while(stack_level-- && (var = stack[stack_level])) { > + if (HASH_OF(*var)->nApplyCount > 1) { > + HASH_OF(*var)->nApplyCount--; > + } > + } > + efree(stack); > + efree(args); > + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive > references"); > + RETURN_FALSE; > + } > + efree(stack); > } > > efree(args); > diff --git a/ext/mbstring/tests/bug66964.phpt b/ext/mbstring/tests/bug66964.phpt > new file mode 100644 > index 0000000..e982aa2 > --- /dev/null > +++ b/ext/mbstring/tests/bug66964.phpt > @@ -0,0 +1,53 @@ > +--TEST-- > +Bug #66964 (mb_convert_variables() cannot detect recursion) > +--SKIPIF-- > +<?php extension_loaded('mbstring') or die('skip mbstring not > available'); ?> > +--FILE-- > +<?php > +$a[] = &$a; > +var_dump(mb_convert_variables('utf-8', 'auto', $a)); > +var_dump(mb_convert_variables('utf-8', 'utf-8', $a)); > + > +unset($a); > +$a[] = '日本語テキスト'; > +$a[] = '日本語テキスト'; > +$a[] = '日本語テキスト'; > +$a[] = '日本語テキスト'; > +var_dump(mb_convert_variables('utf-8', 'utf-8', $a), $a); > + > +$a[] = &$a; > +var_dump(mb_convert_variables('utf-8', 'utf-8', $a), $a); > + > +?> > +--EXPECTF-- > +Warning: mb_convert_variables(): %s on line %d > +bool(false) > + > +Warning: mb_convert_variables(): %s on line %d > +bool(false) > +string(5) "UTF-8" > +array(4) { > + [0]=> > + string(21) "日本語テキスト" > + [1]=> > + string(21) "日本語テキスト" > + [2]=> > + string(21) "日本語テキスト" > + [3]=> > + string(21) "日本語テキスト" > +} > + > +Warning: mb_convert_variables(): %s on line %d > +bool(false) > +array(5) { > + [0]=> > + string(21) "日本語テキスト" > + [1]=> > + string(21) "日本語テキスト" > + [2]=> > + string(21) "日本語テキスト" > + [3]=> > + string(21) "日本語テキスト" > + [4]=> > + *RECURSION* > +} > \ No newline at end of file >

« previous php.cvs (#94349) next »