tony2001 Sat Mar 18 22:24:05 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pdo pdo_stmt.c Log: MFH: check stream for NULL before writing to it remove unnecessary semicolons http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.32&r2=1.118.2.33&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.32 php-src/ext/pdo/pdo_stmt.c:1.118.2.33 --- php-src/ext/pdo/pdo_stmt.c:1.118.2.32 Wed Mar 15 15:25:50 2006 +++ php-src/ext/pdo/pdo_stmt.c Sat Mar 18 22:24:05 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.118.2.32 2006/03/15 15:25:50 iliaa Exp $ */ +/* $Id: pdo_stmt.c,v 1.118.2.33 2006/03/18 22:24:05 tony2001 Exp $ */ /* The PDO Statement Handle Class */ @@ -42,19 +42,19 @@ * since it is a .c file, it won't be installed for use by PECL extensions, so we include it here. */ ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0) ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0) @@ -62,10 +62,10 @@ ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1) -ZEND_END_ARG_INFO(); +ZEND_END_ARG_INFO() /* }}} */ #endif @@ -1915,6 +1915,10 @@ struct pdo_bound_param_data *param; PHP_STMT_GET_OBJ; + if (out == NULL) { + RETURN_FALSE; + } + php_stream_printf(out TSRMLS_CC, "SQL: [%d] %.*s\n", stmt->query_stringlen, stmt->query_stringlen, stmt->query_string);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php