fmk Fri Nov 18 14:14:33 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.203&r2=1.2027.2.204&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.203 php-src/NEWS:1.2027.2.204
--- php-src/NEWS:1.2027.2.203 Fri Nov 18 13:59:46 2005
+++ php-src/NEWS Fri Nov 18 14:14:31 2005
@@ -3,6 +3,7 @@
?? Nov 2005, PHP 5.1
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.4&r2=1.152.2.5&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.4
php-src/ext/mssql/php_mssql.c:1.152.2.5
--- php-src/ext/mssql/php_mssql.c:1.152.2.4 Mon Nov 14 18:14:25 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:14:32 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.152.2.4 2005/11/14 23:14:25 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.5 2005/11/18 19:14:32 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1865,6 +1865,11 @@
mssql_ptr = result->mssql_ptr;
retvalue = dbresults(mssql_ptr->link);
+
+ while (dbnumcols(mssql_ptr->link) <= 0 && retvalue == SUCCEED) {
+ retvalue = dbresults(mssql_ptr->link);
+ }
+
if (retvalue == FAIL) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
