From 3936f188c810000fc22bc5c1f1fa33b36ed2ddfd Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Fri, 18 Nov 2005 20:41:51 +0000 Subject: [PATCH] MFH: Fix #32009 crash when mssql_bind() is called more than once --- NEWS | 1 + ext/mssql/php_mssql.c | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index f6000095a2..c3a1779a28 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ PHP 4 NEWS 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) diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index edacd2b1bf..397fedc04f 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -2130,17 +2130,22 @@ PHP_FUNCTION(mssql_bind) 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; + } } } -- 2.40.0