tony2001 Sat Apr 22 19:10:40 2006 UTC
Modified files:
/php-src/ext/pdo pdo_stmt.c
Log:
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.157&r2=1.158&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.157 php-src/ext/pdo/pdo_stmt.c:1.158
--- php-src/ext/pdo/pdo_stmt.c:1.157 Mon Mar 27 16:43:02 2006
+++ php-src/ext/pdo/pdo_stmt.c Sat Apr 22 19:10:40 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.157 2006/03/27 16:43:02 tony2001 Exp $ */
+/* $Id: pdo_stmt.c,v 1.158 2006/04/22 19:10:40 tony2001 Exp $ */
/* The PDO Statement Handle Class */
@@ -1055,7 +1055,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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
