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

From: Date: Fri, 18 Nov 2005 20:41:52 +0000
Subject: cvs: php-src(PHP_4_4) / NEWS /ext/mssql php_mssql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-35240@lists.php.net to get a copy of this message
fmk Fri Nov 18 15:41:52 2005 EDT Modified files: (Branch: PHP_4_4) /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.1247.2.920.2.85&r2=1.1247.2.920.2.86&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.85 php-src/NEWS:1.1247.2.920.2.86 --- php-src/NEWS:1.1247.2.920.2.85 Fri Nov 18 14:15:11 2005 +++ php-src/NEWS Fri Nov 18 15:41:49 2005 @@ -3,6 +3,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) +- Fixed bug #32009 (crash when mssql_bind() is called more than once). (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.5&r2=1.86.2.44.2.6&ty=u Index: php-src/ext/mssql/php_mssql.c diff -u 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.6 --- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5 Fri Nov 18 14:15:12 2005 +++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:41:51 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.86.2.44.2.5 2005/11/18 19:15:12 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.86.2.44.2.6 2005/11/18 20:41:51 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -2130,17 +2130,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 (#35240) next »