cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c

From: Date: Sat, 22 Apr 2006 19:10:53 +0000
Subject: cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-37891@lists.php.net to get a copy of this message
tony2001 Sat Apr 22 19:10:53 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pdo pdo_stmt.c Log: MFB: don't segfault if an exception has been thrown from the fetch handler http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.37&r2=1.118.2.38&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.37 php-src/ext/pdo/pdo_stmt.c:1.118.2.38 --- php-src/ext/pdo/pdo_stmt.c:1.118.2.37 Sun Apr 9 08:05:01 2006 +++ php-src/ext/pdo/pdo_stmt.c Sat Apr 22 19:10:53 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.118.2.37 2006/04/09 08:05:01 wez Exp $ */ +/* $Id: pdo_stmt.c,v 1.118.2.38 2006/04/22 19:10:53 tony2001 Exp $ */ /* The PDO Statement Handle Class */ @@ -1107,7 +1107,7 @@ if (return_all) { zval_ptr_dtor(&return_value); /* we don't need that */ return_value = retval; - } else { + } else if (retval) { *return_value = *retval; zval_copy_ctor(return_value); INIT_PZVAL(return_value);

« previous php.cvs (#37891) next »