summaryrefslogtreecommitdiff
path: root/ext/odbc/php_odbc.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-05 17:47:21 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-05 17:47:35 +0200
commitc6e7969f0586ff3129a36ffddb5dc1bb259ff463 (patch)
treee58ef376254803da105917e6b0475d4c79730465 /ext/odbc/php_odbc.c
parent9ad5381a2f94073f2d84bdda9bc8892d18587fdd (diff)
parent69ba81d183130b06d52ea1cd4574864ffae5dd84 (diff)
downloadphp-git-c6e7969f0586ff3129a36ffddb5dc1bb259ff463.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #46050: odbc_next_result corrupts prepared resource
Diffstat (limited to 'ext/odbc/php_odbc.c')
-rw-r--r--ext/odbc/php_odbc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 456ee0931f..915ce95262 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2772,6 +2772,7 @@ PHP_FUNCTION(odbc_next_result)
}
efree(result->values);
result->values = NULL;
+ result->numcols = 0;
}
result->fetched = 0;