summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/odbc/php_odbc.c1
-rw-r--r--ext/odbc/tests/bug46050.phpt27
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"
+}