wez Sat Apr 22 16:35:18 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql mysql_statement.c
Log:
avoid unterminated loop when closing the statement.
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48.2.13&r2=1.48.2.14&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.13
php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.14
--- php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.13 Sun Apr 9 06:49:07 2006
+++ php-src/ext/pdo_mysql/mysql_statement.c Sat Apr 22 16:35:18 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_statement.c,v 1.48.2.13 2006/04/09 06:49:07 wez Exp $ */
+/* $Id: mysql_statement.c,v 1.48.2.14 2006/04/22 16:35:18 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -69,11 +69,14 @@
#endif
#if HAVE_MYSQL_NEXT_RESULT
while (mysql_more_results(S->H->server)) {
- if (mysql_next_result(S->H->server) == 0) {
- MYSQL_RES *res = mysql_store_result(S->H->server);
- if (res) {
- mysql_free_result(res);
- }
+ MYSQL_RES *res;
+ if (mysql_next_result(S->H->server) != 0) {
+ break;
+ }
+
+ res = mysql_store_result(S->H->server);
+ if (res) {
+ mysql_free_result(res);
}
}
#endif
@@ -602,11 +605,13 @@
}
#if HAVE_MYSQL_NEXT_RESULT
while (mysql_more_results(S->H->server)) {
- if (mysql_next_result(S->H->server) == 0) {
- MYSQL_RES *res = mysql_store_result(S->H->server);
- if (res) {
- mysql_free_result(res);
- }
+ MYSQL_RES *res;
+ if (mysql_next_result(S->H->server) != 0) {
+ break;
+ }
+ res = mysql_store_result(S->H->server);
+ if (res) {
+ mysql_free_result(res);
}
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
