MFH: Fix #32009 crash when mssql_bind() is called more than once

diff --git a/NEWS b/NEWS
index dc8240e18faa6ad0e31d891a79998fd2e8faff6e..ff3e53928a39a0d01676eff056f52f6357d766c1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PHP                                                                        NEWS
 - Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
 - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
 - Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
 
 17 Nov 2005, PHP 5.1 Release Candidate 6
 - Changed function parameter parsing to handle integers in a non-strict fashion

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 189ec7b7b4de1cff75f6f3ebefaf8aeadbcdf393..6ff7b32313d5809d7ea8937fd9cbe8eda13a88e1 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -2116,17 +2116,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;
+                       }
                }
        }