Re: svn: /php/php-src/ branches/PHP_5_2/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h

Hi, Obviously use_heap has to be set to true whenever the heap is used. Doesn't it? The problem only occurs on Mac OS X and I noticed this during developing an extension that is just a private one. Moriyoshi On Sun, Sep 6, 2009 at 11:55 PM, Pierre Joye<pierre.php@gmail.com> wrote: > Hi, > > This change breaks the build, sounds wrong and I did not see any leak > in there. Do you have a test case to reproduce the leak you are trying > to fix? > > In the mean time, please revert this change. > > On Sun, Sep 6, 2009 at 4:43 PM, Moriyoshi Koizumi<moriyoshi@php.net> wrote: >> moriyoshi                                Sun, 06 Sep 2009 14:43:09 +0000 >> >> Revision: >> http://svn.php.net/viewvc?view=revision&revision=288109 >> >> Log: >> - Fix leaks. >> >> Changed paths: >>    U   php/php-src/branches/PHP_5_2/Zend/zend.h >>    U   php/php-src/branches/PHP_5_3/Zend/zend.h >>    U   php/php-src/trunk/Zend/zend.h >> >> Modified: php/php-src/branches/PHP_5_2/Zend/zend.h >> =================================================================== >> --- php/php-src/branches/PHP_5_2/Zend/zend.h    2009-09-06 14:34:21 UTC (rev 288108) >> +++ php/php-src/branches/PHP_5_2/Zend/zend.h    2009-09-06 14:43:09 UTC (rev 288109) >> @@ -200,8 +200,8 @@ >>  # define do_alloca(p)          emalloc(p) >>  # define free_alloca(p)        efree(p) >>  # define ALLOCA_FLAG(name) >> -# define do_alloca_with_limit(p, use_heap)             emalloc(p) >> -# define free_alloca_with_limit(p, use_heap)   efree(p) >> +# define do_alloca_with_limit(p, use_heap)             emalloc(p), use_heap = 1 >> +# define free_alloca_with_limit(p, use_heap)   efree(p), use_heap = 1 >>  #endif >> >>  #if ZEND_DEBUG >> >> Modified: php/php-src/branches/PHP_5_3/Zend/zend.h >> =================================================================== >> --- php/php-src/branches/PHP_5_3/Zend/zend.h    2009-09-06 14:34:21 UTC (rev 288108) >> +++ php/php-src/branches/PHP_5_3/Zend/zend.h    2009-09-06 14:43:09 UTC (rev 288109) >> @@ -195,8 +195,8 @@ >>  #else >>  # define ALLOCA_FLAG(name) >>  # define SET_ALLOCA_FLAG(name) >> -# define do_alloca(p, use_heap)                emalloc(p) >> -# define free_alloca(p, use_heap)      efree(p) >> +# define do_alloca(p, use_heap)                emalloc(p), use_heap = 1 >> +# define free_alloca(p, use_heap)      efree(p), use_heap = 1 >>  #endif >> >>  #if ZEND_DEBUG >> >> Modified: php/php-src/trunk/Zend/zend.h >> =================================================================== >> --- php/php-src/trunk/Zend/zend.h       2009-09-06 14:34:21 UTC (rev 288108) >> +++ php/php-src/trunk/Zend/zend.h       2009-09-06 14:43:09 UTC (rev 288109) >> @@ -196,8 +196,8 @@ >>  #else >>  # define ALLOCA_FLAG(name) >>  # define SET_ALLOCA_FLAG(name) >> -# define do_alloca(p, use_heap)                emalloc(p) >> -# define free_alloca(p, use_heap)      efree(p) >> +# define do_alloca(p, use_heap)                emalloc(p), use_heap = 1 >> +# define free_alloca(p, use_heap)      efree(p), use_heap = 1 >>  #endif >> >>  #if ZEND_DEBUG >> >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> > > > > -- > Pierre > > http://blog.thepimp.net | > http://www.libgd.org > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >