From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 17 Feb 2020 21:53:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3090c88f55f53d0a8af4e9dbec2664a24c1fa702;p=php

Merge branch 'PHP-7.3' into PHP-7.4

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

3090c88f55f53d0a8af4e9dbec2664a24c1fa702
diff --cc NEWS
index b56bb2134f,a6c9cbf2b5..abd7cf0c68
--- a/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 e67acbc6e8,08a08b2a54..18abc475b9
--- a/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
 - */