cvs: php-src(PHP_5_0) / NEWS /ext/mssql php_mssql.c

From: Date: Fri, 18 Nov 2005 19:43:16 +0000
Subject: cvs: php-src(PHP_5_0) / NEWS /ext/mssql php_mssql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-35234@lists.php.net to get a copy of this message
fmk Fri Nov 18 14:43:16 2005 EDT Modified files: (Branch: PHP_5_0) /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.1760.2.516&r2=1.1760.2.517&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.516 php-src/NEWS:1.1760.2.517 --- php-src/NEWS:1.1760.2.516 Fri Nov 18 06:01:04 2005 +++ php-src/NEWS Fri Nov 18 14:43:03 2005 @@ -58,6 +58,7 @@ - Fixed bug #33383 (crash when retrieving empty LOBs). (Tony) - Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references). (Tony) - Fixed bug #29983 (PHP does not explicitly set mime type & charset). (Ilia) +- Fixed bug #33153 (crash in mssql_next result). (Frank) 05 Sep 2005, PHP 5.0.5 - Upgraded PCRE library to version 5.0. (Andrei) http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.11&r2=1.137.2.12&ty=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.137.2.11 php-src/ext/mssql/php_mssql.c:1.137.2.12 --- php-src/ext/mssql/php_mssql.c:1.137.2.11 Wed Nov 16 13:24:30 2005 +++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:43:15 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.137.2.11 2005/11/16 18:24:30 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.137.2.12 2005/11/18 19:43:15 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1835,6 +1835,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; }

« previous php.cvs (#35234) next »