diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-05 17:48:44 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-05 17:48:44 +0200 |
| commit | 9fe5479eeb2cb59889ceee6d8a9d71f7c1652032 (patch) | |
| tree | c7e026ec9edbb589e8f5f59086d7a22d05593eea | |
| parent | 47ef51cb45cbd40d307328709dc06a2233a973d5 (diff) | |
| parent | c6e7969f0586ff3129a36ffddb5dc1bb259ff463 (diff) | |
| download | php-git-9fe5479eeb2cb59889ceee6d8a9d71f7c1652032.tar.gz | |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #46050: odbc_next_result corrupts prepared resource
| -rw-r--r-- | ext/odbc/php_odbc.c | 1 | ||||
| -rw-r--r-- | ext/odbc/tests/bug46050.phpt | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index d058fd0191..d6a2239b33 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2373,6 +2373,7 @@ PHP_FUNCTION(odbc_next_result) } efree(result->values); result->values = NULL; + result->numcols = 0; } result->fetched = 0; diff --git a/ext/odbc/tests/bug46050.phpt b/ext/odbc/tests/bug46050.phpt new file mode 100644 index 0000000000..33564f2170 --- /dev/null +++ b/ext/odbc/tests/bug46050.phpt @@ -0,0 +1,27 @@ +--TEST-- +Bug #46050 (odbc_next_result corrupts prepared resource) +--SKIPIF-- +<?php include 'skipif.inc'; ?> +--FILE-- +<?php +include __DIR__ . "/config.inc"; +$conn = odbc_connect($dsn, $user, $pass); +$stmt = odbc_prepare($conn, "SELECT 1"); +var_dump(odbc_execute($stmt)); +var_dump(odbc_fetch_array($stmt)); +var_dump(odbc_next_result($stmt)); +var_dump(odbc_execute($stmt)); +var_dump(odbc_fetch_array($stmt)); +?> +--EXPECT-- +bool(true) +array(1) { + ["1"]=> + string(1) "1" +} +bool(false) +bool(true) +array(1) { + ["1"]=> + string(1) "1" +} |