Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_alloc.c branches/PHP_5_3/Zend/zend_alloc.h branches/PHP_5_3/Zend/zend_compile.c branches/PHP_5_3/Zend/zend_execute.h branches/PHP_5_3/Zend/z
NEWS? --Jani Dmitry Stogov wrote: dmitry Thu, 03 Sep 2009 14:33:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=287992 Log: Fixed bug #46074 (Bus error during running PHP CLI under IRIX 6.5.30) Bug: http://bugs.php.net/46074 (Assigned) Bus error during running PHP CLI under IRIX 6.5.30 Changed paths: U php/php-src/branches/PHP_5_3/Zend/zend_alloc.c U php/php-src/branches/PHP_5_3/Zend/zend_alloc.h U php/php-src/branches/PHP_5_3/Zend/zend_compile.c U php/php-src/branches/PHP_5_3/Zend/zend_execute.h U php/php-src/branches/PHP_5_3/Zend/zend_vm_def.h U php/php-src/branches/PHP_5_3/Zend/zend_vm_execute.h U php/php-src/branches/PHP_5_3/Zend/zend_vm_execute.skl U php/php-src/trunk/Zend/zend_alloc.c U php/php-src/trunk/Zend/zend_alloc.h U php/php-src/trunk/Zend/zend_compile.c U php/php-src/trunk/Zend/zend_execute.h U php/php-src/trunk/Zend/zend_vm_def.h U php/php-src/trunk/Zend/zend_vm_execute.h U php/php-src/trunk/Zend/zend_vm_execute.skl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_alloc.c
Sure. > -Original Message- > From: Derick Rethans [mailto:der...@php.net] > Sent: Tuesday, August 11, 2009 2:11 AM > To: Andi Gutmans > Cc: php-cvs@lists.php.net; gwy...@php.net > Subject: Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_alloc.c > > On Sun, 9 Aug 2009, Andi Gutmans wrote: > > > andi Sun, 09 Aug 2009 04:46:30 + > > > > Revision: http://svn.php.net/viewvc?view=revision&revision=286941 > > > > Log: > > - MFH > > Could you please commit those changes to trunk and branches/* at the > same time? Or at least repeat the log message? "MFH" is not very useful > if you're trying to figure out what this patch does. > > regards, > Derick > > > > > Changed paths: > > U php/php-src/branches/PHP_5_3/Zend/zend_alloc.c > > > > Modified: php/php-src/branches/PHP_5_3/Zend/zend_alloc.c > > === > > --- php/php-src/branches/PHP_5_3/Zend/zend_alloc.c 2009-08-09 04:46:02 UTC > (rev 286940) > > +++ php/php-src/branches/PHP_5_3/Zend/zend_alloc.c 2009-08-09 04:46:30 UTC > (rev 286941) > > @@ -709,12 +709,14 @@ > > unsigned int n; > > unsigned int index = 0; > > > > - do { > > - n = offset[_size & 15]; > > + n = offset[_size & 15]; > > + while (n == 4) { > > _size >>= 4; > > index += n; > > - } while (n == 4); > > - return index; > > + n = offset[_size & 15]; > > + } > > + > > + return index + n; > > #endif > > } > > > > > > > > -- > http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org > twitter: @derickr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_alloc.c
On Sun, 9 Aug 2009, Andi Gutmans wrote: > andi Sun, 09 Aug 2009 04:46:30 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=286941 > > Log: > - MFH Could you please commit those changes to trunk and branches/* at the same time? Or at least repeat the log message? "MFH" is not very useful if you're trying to figure out what this patch does. regards, Derick > > Changed paths: > U php/php-src/branches/PHP_5_3/Zend/zend_alloc.c > > Modified: php/php-src/branches/PHP_5_3/Zend/zend_alloc.c > === > --- php/php-src/branches/PHP_5_3/Zend/zend_alloc.c2009-08-09 04:46:02 UTC > (rev 286940) > +++ php/php-src/branches/PHP_5_3/Zend/zend_alloc.c2009-08-09 04:46:30 UTC > (rev 286941) > @@ -709,12 +709,14 @@ > unsigned int n; > unsigned int index = 0; > > - do { > - n = offset[_size & 15]; > + n = offset[_size & 15]; > + while (n == 4) { > _size >>= 4; > index += n; > - } while (n == 4); > - return index; > + n = offset[_size & 15]; > + } > + > + return index + n; > #endif > } > > > -- http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org twitter: @derickr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php