dmitry                                   Wed, 14 Jul 2010 10:27:08 +0000

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

Log:
Fixed incorrect reinitialization

Changed paths:
    U   php/php-src/branches/PHP_5_2/Zend/zend_alloc.c
    U   php/php-src/branches/PHP_5_3/Zend/zend_alloc.c
    U   php/php-src/trunk/Zend/zend_alloc.c

Modified: php/php-src/branches/PHP_5_2/Zend/zend_alloc.c
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/zend_alloc.c      2010-07-14 06:54:23 UTC 
(rev 301261)
+++ php/php-src/branches/PHP_5_2/Zend/zend_alloc.c      2010-07-14 10:27:08 UTC 
(rev 301262)
@@ -1090,7 +1090,7 @@
                                mm_heap->large_free_buckets[i]->parent = 
&mm_heap->large_free_buckets[i];
                        }
                }
-               mm_heap->rest_buckets[0]->next_free_block = 
mm_heap->rest_buckets[1]->prev_free_block = ZEND_MM_REST_BUCKET(mm_heap);
+               mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = 
ZEND_MM_REST_BUCKET(mm_heap);

                free(heap);
                heap = mm_heap;

Modified: php/php-src/branches/PHP_5_3/Zend/zend_alloc.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_alloc.c      2010-07-14 06:54:23 UTC 
(rev 301261)
+++ php/php-src/branches/PHP_5_3/Zend/zend_alloc.c      2010-07-14 10:27:08 UTC 
(rev 301262)
@@ -1115,7 +1115,7 @@
                                mm_heap->large_free_buckets[i]->parent = 
&mm_heap->large_free_buckets[i];
                        }
                }
-               mm_heap->rest_buckets[0]->next_free_block = 
mm_heap->rest_buckets[1]->prev_free_block = ZEND_MM_REST_BUCKET(mm_heap);
+               mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = 
ZEND_MM_REST_BUCKET(mm_heap);

                free(heap);
                heap = mm_heap;

Modified: php/php-src/trunk/Zend/zend_alloc.c
===================================================================
--- php/php-src/trunk/Zend/zend_alloc.c 2010-07-14 06:54:23 UTC (rev 301261)
+++ php/php-src/trunk/Zend/zend_alloc.c 2010-07-14 10:27:08 UTC (rev 301262)
@@ -1115,7 +1115,7 @@
                                mm_heap->large_free_buckets[i]->parent = 
&mm_heap->large_free_buckets[i];
                        }
                }
-               mm_heap->rest_buckets[0]->next_free_block = 
mm_heap->rest_buckets[1]->prev_free_block = ZEND_MM_REST_BUCKET(mm_heap);
+               mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = 
ZEND_MM_REST_BUCKET(mm_heap);

                free(heap);
                heap = mm_heap;

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

Reply via email to