Fix #80592: all floats are the same in ODBC parameters

We must not release the strings until we are done with them.

Closes GH-6579.

diff --git a/NEWS b/NEWS
index f40480ca88d02f1ec345a369960de7e32f8a43b5..69aa04f375d07ebebb9da36f7bf4260be5b7b900 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,9 @@ PHP                                                                        NEWS
   . Fixed bug #77935 (Crash in mysqlnd_fetch_stmt_row_cursor when calling an SP
     with a cursor). (Nikita)
 
+- ODBC:
+  . Fixed bug #80592 (all floats are the same in ODBC parameters). (cmb)
+
 - PDO_Firebird:
   . Fixed bug #80521 (Parameters with underscores no longer recognized). (cmb,
     Simonov Denis)

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 4cfdc6c30dfdecda60900301242bd934f435359b..e7498ee2b7d356a20151ff97911d3d11ce11a757 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -963,6 +963,7 @@ PHP_FUNCTION(odbc_prepare)
 typedef struct odbc_params_t {
        SQLLEN vallen;
        int fp;
+       zend_string *zstr;
 } odbc_params_t;
 
 static void odbc_release_params(odbc_result *result, odbc_params_t *params) {
@@ -971,6 +972,9 @@ static void odbc_release_params(odbc_result *result, odbc_params_t *params) {
                if (params[i].fp != -1) {
                        close(params[i].fp);
                }
+               if (params[i].zstr) {
+                       zend_string_release(params[i].zstr);
+               }
        }
        efree(params);
 }
@@ -1004,6 +1008,7 @@ PHP_FUNCTION(odbc_execute)
                params = (odbc_params_t *)safe_emalloc(sizeof(odbc_params_t), result->numparams, 0);
                for(i = 0; i < result->numparams; i++) {
                        params[i].fp = -1;
+                       params[i].zstr = NULL;
                }
 
                i = 1;
@@ -1017,6 +1022,7 @@ PHP_FUNCTION(odbc_execute)
 
                        params[i-1].vallen = ZSTR_LEN(tmpstr);
                        params[i-1].fp = -1;
+                       params[i-1].zstr = tmpstr;
 
                        if (IS_SQL_BINARY(result->param_info[i-1].sqltype)) {
                                ctype = SQL_C_BINARY;
@@ -1030,7 +1036,6 @@ PHP_FUNCTION(odbc_execute)
 
                                if (ZSTR_LEN(tmpstr) != strlen(ZSTR_VAL(tmpstr))) {
                                        odbc_release_params(result, params);
-                                       zend_string_release(tmpstr);
                                        RETURN_FALSE;
                                }
                                filename = estrndup(&ZSTR_VAL(tmpstr)[1], ZSTR_LEN(tmpstr) - 2);
@@ -1040,14 +1045,12 @@ PHP_FUNCTION(odbc_execute)
                                if (php_check_open_basedir(filename)) {
                                        efree(filename);
                                        odbc_release_params(result, params);
-                                       zend_string_release(tmpstr);
                                        RETURN_FALSE;
                                }
 
                                if ((params[i-1].fp = open(filename,O_RDONLY)) == -1) {
                                        php_error_docref(NULL, E_WARNING,"Can't open file %s", filename);
                                        odbc_release_params(result, params);
-                                       zend_string_release(tmpstr);
                                        efree(filename);
                                        RETURN_FALSE;
                                }
@@ -1076,10 +1079,8 @@ PHP_FUNCTION(odbc_execute)
                        if (rc == SQL_ERROR) {
                                odbc_sql_error(result->conn_ptr, result->stmt, "SQLBindParameter");
                                odbc_release_params(result, params);
-                               zend_string_release(tmpstr);
                                RETURN_FALSE;
                        }
-                       zend_string_release(tmpstr);
                        if (++i > result->numparams) break;
                } ZEND_HASH_FOREACH_END();
        }

diff --git a/ext/odbc/tests/bug80592.phpt b/ext/odbc/tests/bug80592.phpt
new file mode 100644 (file)
index 0000000..a0e096b
--- /dev/null
+++ b/ext/odbc/tests/bug80592.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #80592 (all floats are the same in ODBC parameters)
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+odbc_exec($conn,"CREATE TABLE bug80592 (f1 float not null, f2 float not null, f3 float not null)"); 
+$stmt = odbc_prepare($conn, "INSERT INTO bug80592 (f1, f2, f3) values (?, ?, ?)");
+odbc_execute($stmt, [1.0, 2.0, 3.0]);
+$res = odbc_exec($conn, "SELECT f1, f2, f3 from bug80592");
+var_dump(odbc_fetch_array($res));
+?>
+--CLEAN--
+<?php
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+odbc_exec($conn, "DROP TABLE bug80592");
+?>
+--EXPECT--
+array(3) {
+  ["f1"]=>
+  string(3) "1.0"
+  ["f2"]=>
+  string(3) "2.0"
+  ["f3"]=>
+  string(3) "3.0"
+}