From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 28 Sep 2020 20:57:59 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1d8395c773854c5d8a2a39241750e636e95d92c;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #67465: NULL Pointer dereference in odbc_handle_preparer
---

f1d8395c773854c5d8a2a39241750e636e95d92c
diff --cc NEWS
index 162da977b7,538e121a5a..467f8b68b2
--- a/NEWS
+++ b/NEWS
@@@ -23,10 -21,9 +23,13 @@@ PH
    . Fixed bug #80083 (Optimizer pass 6 removes variables used for ibm_db2 data
      binding). (Nikita)
  
 +- PCRE:
 +  . Updated to PCRE 10.35. (cmb)
 +  . Fixed bug #80118 (Erroneous whitespace match with JIT only). (cmb)
 +
+ - PDO_ODBC:
+   . Fixed bug #67465 (NULL Pointer dereference in odbc_handle_preparer). (cmb)
+ 
  - Standard:
    . Fixed bug #80114 (parse_url does not accept URLs with port 0). (cmb, twosee)
    . Fixed bug #76943 (Inconsistent stream_wrapper_restore() errors). (cmb)