Fix #80152: odbc_execute() moves internal pointer of $params

[cmb69]

As least intrusive fix, we separate the passed array argument.

---

For the "master" branch, the following fix seems to be preferable:

 ext/odbc/php_odbc.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index bfb72bcff7..a8a8042c12 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -991,25 +991,13 @@ PHP_FUNCTION(odbc_execute)
 			RETURN_FALSE;
 		}
 
-		zend_hash_internal_pointer_reset(pv_param_ht);
 		params = (params_t *)safe_emalloc(sizeof(params_t), result->numparams, 0);
 		for(i = 0; i < result->numparams; i++) {
 			params[i].fp = -1;
 		}
 
-		for(i = 1; i <= result->numparams; i++) {
-			if ((tmp = zend_hash_get_current_data(pv_param_ht)) == NULL) {
-				php_error_docref(NULL, E_WARNING,"Error getting parameter");
-				SQLFreeStmt(result->stmt,SQL_RESET_PARAMS);
-				for (i = 0; i < result->numparams; i++) {
-					if (params[i].fp != -1) {
-						close(params[i].fp);
-					}
-				}
-				efree(params);
-				RETURN_FALSE;
-			}
-
+		i = 1;
+		ZEND_HASH_FOREACH_VAL(pv_param_ht, tmp) {
 			otype = Z_TYPE_P(tmp);
 			if (!try_convert_to_string(tmp)) {
 				SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
@@ -1099,8 +1087,11 @@ PHP_FUNCTION(odbc_execute)
 				efree(params);
 				RETURN_FALSE;
 			}
-			zend_hash_move_forward(pv_param_ht);
-		}
+			if (i > result->numparams) {
+				break;
+			}
+			i++;
+		} ZEND_HASH_FOREACH_END();
 	}
 	/* Close cursor, needed for doing multiple selects */
 	rc = SQLFreeStmt(result->stmt, SQL_CLOSE);

[cmb69]

The AppVeyor failure is unrelated (flaky test).

[nikic]

LG. Using ZEND_HASH_FOREACH_VAL is definitely preferred for master, but isn't your suggested diff missing some kind of check that the array has sufficient elements? That is, the "Error getting parameter" error condition seems to get lost.

[cmb69]

There is already a check immediately before the loop:

php-src/ext/odbc/php_odbc.c

Lines 1327 to 1329 in f6cda06

	if ((ne = zend_hash_num_elements(Z_ARRVAL_P(pv_param_arr))) < result->numparams) {
	php_error_docref(NULL, E_WARNING,"Not enough parameters (%d should be %d) given", ne, result->numparams);
	RETURN_FALSE;

Isn't that sufficient?

[nikic]

@cmb69 Ah yes, that does look sufficient.

[cmb69]

"master" improved with a6ecafe.