Fixed #37209 (mssql_execute with non fatal errors)

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index b1f865e08b2f7a24e10448981c435a0bbd2a147e..400de7376fbe47bc331e14d4ee7db7144a93e91e 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -2101,6 +2101,7 @@ PHP_FUNCTION(mssql_execute)
        mssql_result *result;
        int num_fields;
        int batchsize;
+       int exec_retval;
 
        batchsize = MS_SQL_G(batchsize);
 
@@ -2111,10 +2112,15 @@ PHP_FUNCTION(mssql_execute)
        ZEND_FETCH_RESOURCE(statement, mssql_statement *, &stmt, -1, "MS SQL-Statement", le_statement);
 
        mssql_ptr=statement->link;
+       exec_retval = dbrpcexec(mssql_ptr->link);
 
-       if (dbrpcexec(mssql_ptr->link)==FAIL || dbsqlok(mssql_ptr->link)==FAIL) {
+       if (exec_retval == FAIL || dbsqlok(mssql_ptr->link) == FAIL) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored procedure execution failed");
-               dbcancel(mssql_ptr->link);
+
+               if (exec_retval == FAIL) {
+                       dbcancel(mssql_ptr->link);
+               }
+
                RETURN_FALSE;
        }