dmitry                                   Thu, 01 Dec 2011 13:58:29 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=320245

Log:
Fixed icorrect key length after updating constant index

Changed paths:
    U   php/php-src/branches/PHP_5_4/Zend/zend_hash.c
    U   php/php-src/trunk/Zend/zend_hash.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_hash.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_hash.c       2011-12-01 13:30:19 UTC 
(rev 320244)
+++ php/php-src/branches/PHP_5_4/Zend/zend_hash.c       2011-12-01 13:58:29 UTC 
(rev 320245)
@@ -1399,6 +1399,7 @@
                        p->h = num_index;
                } else {
                        p->h = h;
+                       p->nKeyLength = str_length;
                        if (IS_INTERNED(str_index)) {
                                p->arKey = str_index;
                        } else {

Modified: php/php-src/trunk/Zend/zend_hash.c
===================================================================
--- php/php-src/trunk/Zend/zend_hash.c  2011-12-01 13:30:19 UTC (rev 320244)
+++ php/php-src/trunk/Zend/zend_hash.c  2011-12-01 13:58:29 UTC (rev 320245)
@@ -1399,6 +1399,7 @@
                        p->h = num_index;
                } else {
                        p->h = h;
+                       p->nKeyLength = str_length;
                        if (IS_INTERNED(str_index)) {
                                p->arKey = str_index;
                        } else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to