dmitry Fri Aug 1 14:22:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar stream.c
Log:
Fixed bug #44100 (Inconsistent handling of static array declarations with
duplicate keys)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stream.c?r1=1.27.2.12&r2=1.27.2.13&diff_format=u
Index: php-src/ext/phar/stream.c
diff -u php-src/ext/phar/stream.c:1.27.2.12 php-src/ext/phar/stream.c:1.27.2.13
--- php-src/ext/phar/stream.c:1.27.2.12 Fri Aug 1 13:48:44 2008
+++ php-src/ext/phar/stream.c Fri Aug 1 14:22:48 2008
@@ -911,7 +911,7 @@
efree(entry->filename);
entry->filename = new_key;
entry->filename_len = new_key_len;
-
zend_hash_update_current_key_ex(&phar->manifest, key_type, new_key,
new_key_len, 0, NULL);
+
zend_hash_update_current_key_ex(&phar->manifest, key_type, new_key,
new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL);
}
}
@@ -928,7 +928,7 @@
memcpy(new_key, resource_to->path + 1, to_len);
memcpy(new_key + to_len, key + from_len,
key_len - from_len);
new_key[new_key_len] = 0;
-
zend_hash_update_current_key_ex(&phar->virtual_dirs, key_type, new_key,
new_key_len, 0, NULL);
+
zend_hash_update_current_key_ex(&phar->virtual_dirs, key_type, new_key,
new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL);
efree(new_key);
}
}
@@ -947,7 +947,7 @@
memcpy(new_key, resource_to->path + 1, to_len);
memcpy(new_key + to_len, key + from_len,
key_len - from_len);
new_key[new_key_len] = 0;
-
zend_hash_update_current_key_ex(&phar->mounted_dirs, key_type, new_key,
new_key_len, 0, NULL);
+
zend_hash_update_current_key_ex(&phar->mounted_dirs, key_type, new_key,
new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL);
efree(new_key);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
