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

From: Date: Fri, 18 Nov 2005 19:13:36 +0000
Subject: cvs: php-src / NEWS /ext/mssql php_mssql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-35230@lists.php.net to get a copy of this message
fmk Fri Nov 18 14:13:36 2005 EDT Modified files: /php-src NEWS /php-src/ext/mssql php_mssql.c Log: Fix #33153 Crash in mssql_next_result(). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2079&r2=1.2080&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2079 php-src/NEWS:1.2080 --- php-src/NEWS:1.2079 Fri Nov 18 11:41:49 2005 +++ php-src/NEWS Fri Nov 18 14:13:34 2005 @@ -26,3 +26,4 @@ - Added possibility to check in which extension an internal function was defined using reflection API. (Johannes) - Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) +- Fixed bug #33153 (crash in mssql_next result). (Frank) http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.155&r2=1.156&ty=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.155 php-src/ext/mssql/php_mssql.c:1.156 --- php-src/ext/mssql/php_mssql.c:1.155 Mon Nov 14 18:14:54 2005 +++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:13:35 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.155 2005/11/14 23:14:54 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.156 2005/11/18 19:13:35 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; }

« previous php.cvs (#35230) next »