svn: /php/php-src/ branches/PHP_5_4/ext/spl/spl_dllist.c trunk/ext/spl/spl_dllist.c

colder Tue, 12 Jul 2011 21:57:14 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313184 Log: Fix crash Changed paths: U php/php-src/branches/PHP_5_4/ext/spl/spl_dllist.c U php/php-src/trunk/ext/spl/spl_dllist.c Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_dllist.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/spl_dllist.c 2011-07-12 21:43:17 UTC (rev 313183) +++ php/php-src/branches/PHP_5_4/ext/spl/spl_dllist.c 2011-07-12 21:57:14 UTC (rev 313184) @@ -1202,11 +1202,11 @@ /* flags */ ALLOC_INIT_ZVAL(flags); - if (!php_var_unserialize(&elem, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(elem) != IS_LONG) { + if (!php_var_unserialize(&flags, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(flags) != IS_LONG) { zval_ptr_dtor(&flags); goto error; } - intern->flags = Z_LVAL_P(elem); + intern->flags = Z_LVAL_P(flags); zval_ptr_dtor(&flags); /* elements */ Modified: php/php-src/trunk/ext/spl/spl_dllist.c =================================================================== --- php/php-src/trunk/ext/spl/spl_dllist.c 2011-07-12 21:43:17 UTC (rev 313183) +++ php/php-src/trunk/ext/spl/spl_dllist.c 2011-07-12 21:57:14 UTC (rev 313184) @@ -1202,11 +1202,11 @@ /* flags */ ALLOC_INIT_ZVAL(flags); - if (!php_var_unserialize(&elem, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(elem) != IS_LONG) { + if (!php_var_unserialize(&flags, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(flags) != IS_LONG) { zval_ptr_dtor(&flags); goto error; } - intern->flags = Z_LVAL_P(elem); + intern->flags = Z_LVAL_P(flags); zval_ptr_dtor(&flags); /* elements */