cvs: php-src(PHP_5_3) /ext/spl spl_directory.c

colder Wed Apr 9 19:01:13 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl_directory.c Log: MFH: Fix #44511 (Ensure no exception was already thrown by php_stream_opendir) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.18&r2=1.45.2.27.2.23.2.19&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.18 php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.19 --- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.18 Thu Mar 13 19:46:44 2008 +++ php-src/ext/spl/spl_directory.c Wed Apr 9 19:01:12 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.18 2008/03/13 19:46:44 helly Exp $ */ +/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.19 2008/04/09 19:01:12 colder Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -215,7 +215,7 @@ } intern->u.dir.index = 0; - if (intern->u.dir.dirp == NULL) { + if (EG(exception) || intern->u.dir.dirp == NULL) { /* throw exception: should've been already happened */ intern->u.dir.entry.d_name[0] = '\0'; } else {