moriyoshi Wed Dec 4 11:41:29 2002 EDT
Modified files:
/php4/ext/standard array.c
Log:
Fixed segfaults of array_walk() when keys are passed to cb by reference.
Fixed bug #12776.
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.206 php4/ext/standard/array.c:1.207
--- php4/ext/standard/array.c:1.206 Tue Dec 3 10:02:06 2002
+++ php4/ext/standard/array.c Wed Dec 4 11:41:28 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.206 2002/12/03 15:02:06 moriyoshi Exp $ */
+/* $Id: array.c,v 1.207 2002/12/04 16:41:28 moriyoshi Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -953,9 +953,6 @@
ulong num_key;
HashPosition pos;
- /* Allocate space for key */
- MAKE_STD_ZVAL(key);
-
/* Set up known arguments */
args[1] = &key;
args[2] = userdata;
@@ -964,14 +961,15 @@
/* Iterate through hash */
while (zend_hash_get_current_data_ex(target_hash, (void **)&args[0], &pos) ==
SUCCESS) {
+ /* Allocate space for key */
+ MAKE_STD_ZVAL(key);
+
/* Set up the key */
if (zend_hash_get_current_key_ex(target_hash, &string_key,
&string_key_len, &num_key, 0, &pos) == HASH_KEY_IS_LONG) {
Z_TYPE_P(key) = IS_LONG;
Z_LVAL_P(key) = num_key;
} else {
- Z_TYPE_P(key) = IS_STRING;
- Z_STRVAL_P(key) = string_key;
- Z_STRLEN_P(key) = string_key_len-1;
+ ZVAL_STRINGL(key, string_key, string_key_len-1, 1);
}
/* Call the userland function */
@@ -992,9 +990,9 @@
break;
}
+ zval_ptr_dtor(&key);
zend_hash_move_forward_ex(target_hash, &pos);
}
- zval_ptr_dtor(&key);
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
