5.2 is OK. :-) 2009/7/30 Ilia Alshanetsky <i...@prohost.org>: > This does not affect 5.2? > > On 30-Jul-09, at 8:06 AM, Felipe Pena wrote: > >> felipe Thu, 30 Jul 2009 12:06:40 +0000 >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=286555 >> >> Log: >> - Fixed bug #49108 (2nd scan_dir produces seg fault) >> >> Bug: http://bugs.php.net/49108 (Assigned) 2nd scan_dir produces seg fault >> >> Changed paths: >> U php/php-src/branches/PHP_5_3/NEWS >> U php/php-src/branches/PHP_5_3/ext/standard/dir.c >> U php/php-src/trunk/ext/standard/dir.c >> >> Modified: php/php-src/branches/PHP_5_3/NEWS >> =================================================================== >> --- php/php-src/branches/PHP_5_3/NEWS 2009-07-30 11:59:02 UTC (rev >> 286554) >> +++ php/php-src/branches/PHP_5_3/NEWS 2009-07-30 12:06:40 UTC (rev >> 286555) >> @@ -8,6 +8,7 @@ >> - Fixed signature generation/validation for zip archives in ext/phar. >> (Greg) >> - Fixed memory leak in stream_is_local(). (Felipe) >> >> +- Fixed bug #49108 (2nd scan_dir produces seg fault). (Felipe) >> - Fixed bug #49065 ("disable_functions" php.ini option does not work on >> Zend extensions). (Stas) >> - Fixed bug #49064 (--enable-session=shared does not work: undefined >> symbol: >> >> Modified: php/php-src/branches/PHP_5_3/ext/standard/dir.c >> =================================================================== >> --- php/php-src/branches/PHP_5_3/ext/standard/dir.c 2009-07-30 >> 11:59:02 UTC (rev 286554) >> +++ php/php-src/branches/PHP_5_3/ext/standard/dir.c 2009-07-30 >> 12:06:40 UTC (rev 286555) >> @@ -556,7 +556,9 @@ >> RETURN_FALSE; >> } >> >> - context = php_stream_context_from_zval(zcontext, 0); >> + if (zcontext) { >> + context = php_stream_context_from_zval(zcontext, 0); >> + } >> >> if (!flags) { >> n = php_stream_scandir(dirn, &namelist, context, (void *) >> php_stream_dirent_alphasort); >> >> Modified: php/php-src/trunk/ext/standard/dir.c >> =================================================================== >> --- php/php-src/trunk/ext/standard/dir.c 2009-07-30 11:59:02 UTC >> (rev 286554) >> +++ php/php-src/trunk/ext/standard/dir.c 2009-07-30 12:06:40 UTC >> (rev 286555) >> @@ -586,7 +586,10 @@ >> return; >> } >> >> - context = php_stream_context_from_zval(zcontext, 0); >> + if (zcontext) { >> + context = php_stream_context_from_zval(zcontext, 0); >> + } >> + >> if (FAILURE == php_stream_path_param_encode(ppdirn, &dirn, >> &dirn_len, REPORT_ERRORS, context)) { >> RETURN_FALSE; >> } >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php > >
-- Regards, Felipe Pena -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
