cvs: php-src /ext/spl spl_array.c
| From: | Dmitry Stogov | Date: | Fri, 12 Aug 2005 12:14:32 +0000 |
| Subject: | cvs: php-src /ext/spl spl_array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33327@lists.php.net to get a copy of this message | ||
dmitry Fri Aug 12 08:14:32 2005 EDT
Modified files:
/php-src/ext/spl spl_array.c
Log:
Fixed SIGSEGV
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.74&r2=1.75&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.74 php-src/ext/spl/spl_array.c:1.75
--- php-src/ext/spl/spl_array.c:1.74 Fri Aug 12 07:29:32 2005
+++ php-src/ext/spl/spl_array.c Fri Aug 12 08:14:31 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.74 2005/08/12 11:29:32 dmitry Exp $ */
+/* $Id: spl_array.c,v 1.75 2005/08/12 12:14:31 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -692,7 +692,7 @@
if (Z_TYPE_P(intern->array) == IS_OBJECT) {
do {
- if (zend_hash_get_current_key_ex(aht, &string_key, &string_length, &num_key, 0,
&intern->pos) == UG(unicode)?HASH_KEY_IS_UNICODE:HASH_KEY_IS_STRING) {
+ if (zend_hash_get_current_key_ex(aht, &string_key, &string_length, &num_key, 0,
&intern->pos) == (UG(unicode)?HASH_KEY_IS_UNICODE:HASH_KEY_IS_STRING)) {
if (!string_length ||
((UG(unicode) && ((UChar*)string_key)[0]) ||
(!UG(unicode) && string_key[0]))) {