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

From: Date: Fri, 18 Nov 2005 20:41:03 +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-35239@lists.php.net to get a copy of this message
fmk Fri Nov 18 15:41:03 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/mssql php_mssql.c Log: MFH: Fix #32009 crash when mssql_bind() is called more than once http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.517&r2=1.1760.2.518&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.517 php-src/NEWS:1.1760.2.518 --- php-src/NEWS:1.1760.2.517 Fri Nov 18 14:43:03 2005 +++ php-src/NEWS Fri Nov 18 15:41:02 2005 @@ -59,6 +59,7 @@ - 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) +- Fixed bug #32009 (crash when mssql_bind() is called more than once). (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.12&r2=1.137.2.13&ty=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.137.2.12 php-src/ext/mssql/php_mssql.c:1.137.2.13 --- php-src/ext/mssql/php_mssql.c:1.137.2.12 Fri Nov 18 14:43:15 2005 +++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:41:03 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.137.2.12 2005/11/18 19:43:15 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.137.2.13 2005/11/18 20:41:03 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -2083,17 +2083,22 @@ zend_hash_init(statement->binds, 13, NULL, _mssql_bind_hash_dtor, 0); } - memset((void*)&bind,0,sizeof(mssql_bind)); - zend_hash_add(statement->binds,Z_STRVAL_PP(param_name),Z_STRLEN_PP(param_name),&bind,sizeof(mssql_bind),(void **)&bindp); - if( NULL == bindp ) RETURN_FALSE; - bindp->zval=*var; - zval_add_ref(var); - - /* no call to dbrpcparam if RETVAL */ - if ( strcmp("RETVAL",Z_STRVAL_PP(param_name))!=0 ) { - if (dbrpcparam(mssql_ptr->link, Z_STRVAL_PP(param_name), (BYTE)status, type, maxlen, datalen, (LPBYTE)value)==FAIL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set parameter"); - RETURN_FALSE; + if (zend_hash_exists(statement->binds, Z_STRVAL_PP(param_name), Z_STRLEN_PP(param_name))) { + RETURN_FALSE; + } + else { + memset((void*)&bind,0,sizeof(mssql_bind)); + zend_hash_add(statement->binds, Z_STRVAL_PP(param_name), Z_STRLEN_PP(param_name), &bind, sizeof(mssql_bind), (void **)&bindp); + if( NULL == bindp ) RETURN_FALSE; + bindp->zval=*var; + zval_add_ref(var); + + /* no call to dbrpcparam if RETVAL */ + if ( strcmp("RETVAL",Z_STRVAL_PP(param_name))!=0 ) { + if (dbrpcparam(mssql_ptr->link, Z_STRVAL_PP(param_name), (BYTE)status, type, maxlen, datalen, (LPBYTE)value)==FAIL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set parameter"); + RETURN_FALSE; + } } }

« previous php.cvs (#35239) next »