Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79038: PDOStatement::nextRowset() leaks column values

diff --cc NEWS
index b56bb2134faaaf27cb4c98790ca84ee40f1e2a58,a6c9cbf2b572d96ebebf733f85228c26376127d8..abd7cf0c68336819895de1fa11c29b7a3f0a3826
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -25,10 -17,10 +25,13 @@@ PH
  - PCRE:
    . Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback
      and unicode). (Nikita)
 +  . Fixed bug #79241 (Segmentation fault on preg_match()). (Nikita)
 +  . Fixed bug #79257 (Duplicate named groups (?J) prefer last alternative even
 +    if not matched). (Nikita)
  
+ - PDO_ODBC:
+   . Fixed bug #79038 (PDOStatement::nextRowset() leaks column values). (cmb)
+ 
  - Standard:
    . Fixed bug #79254 (getenv() w/o arguments not showing changes). (cmb)
  

diff --cc ext/pdo_odbc/odbc_stmt.c
index e67acbc6e899308a400e32dc07efa4b4f671f13d,08a08b2a54bc4a981da13d56800f04f2a44a916f..18abc475b9ebbfff4487f44ee16ce6a35197c827
--- 1/ext/pdo_odbc/odbc_stmt.c
--- 2/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@@ -864,5 -877,15 +877,6 @@@ const struct pdo_stmt_methods odbc_stmt
        odbc_stmt_set_param,
        odbc_stmt_get_attr, /* get attr */
        NULL, /* get column meta */
-       odbc_stmt_next_rowset
+       odbc_stmt_next_rowset,
+       odbc_stmt_close_cursor
  };
 -
 -/*
 - * Local variables:
 - * tab-width: 4
 - * c-basic-offset: 4
 - * End:
 - * vim600: noet sw=4 ts=4 fdm=marker
 - * vim<600: noet sw=4 ts=4
 - */

diff --cc ext/pdo_odbc/php_pdo_odbc_int.h
Simple merge