fmk Fri Nov 18 14:15:14 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.1247.2.920.2.84&r2=1.1247.2.920.2.85&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.84 php-src/NEWS:1.1247.2.920.2.85
--- php-src/NEWS:1.1247.2.920.2.84 Fri Nov 18 14:03:09 2005
+++ php-src/NEWS Fri Nov 18 14:15:11 2005
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
23 Nov 2005, Version 4.4.2
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.4&r2=1.86.2.44.2.5&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4 Tue Nov 15 12:33:07 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:15:12 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.4 2005/11/15 17:33:07 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.5 2005/11/18 19:15:12 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1874,6 +1874,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
