cvs: php-src /ext/pdo_mysql mysql_statement.c
| From: | Ilia Alshanetsky | Date: | Sat, 09 Jul 2005 05:08:55 +0000 |
| Subject: | cvs: php-src /ext/pdo_mysql mysql_statement.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32845@lists.php.net to get a copy of this message | ||
iliaa Sat Jul 9 01:08:55 2005 EDT
Modified files:
/php-src/ext/pdo_mysql mysql_statement.c
Log:
Added safety checks.
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.35&r2=1.36&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.35 php-src/ext/pdo_mysql/mysql_statement.c:1.36
--- php-src/ext/pdo_mysql/mysql_statement.c:1.35 Sat Jul 9 01:04:43 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Sat Jul 9 01:08:54 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_statement.c,v 1.35 2005/07/09 05:04:43 iliaa Exp $ */
+/* $Id: mysql_statement.c,v 1.36 2005/07/09 05:08:54 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -484,10 +484,14 @@
{
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
#if HAVE_MYSQL_STMT_PREPARE
- return mysql_stmt_free_result(S->stmt);
+ if (S->stmt) {
+ return mysql_stmt_free_result(S->stmt);
+ }
#endif
- mysql_free_result(S->result);
- S->result = NULL;
+ if (S->result) {
+ mysql_free_result(S->result);
+ S->result = NULL;
+ }
return 1;
}