From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 13 Oct 2016 09:31:10 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1144^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9209588d5f8225fb608695d44e7eb7be858997d;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

a9209588d5f8225fb608695d44e7eb7be858997d
diff --cc NEWS
index 3b8c30efea,c20abb5ee7..ba54c56123
--- a/NEWS
+++ b/NEWS
@@@ -30,7 -16,13 +30,8 @@@ PH
    . Fixed bug #73272 (imagescale() is not affected by, but affects
      imagesetinterpolation()). (cmb)
    . Fixed bug #73279 (Integer overflow in gdImageScaleBilinearPalette()). (cmb)
+   . Fixed bug #73280 (Stack Buffer Overflow in GD dynamicGetbuf). (cmb)
  
 -- phpdbg:
 -  . Properly allow for stdin input from a file. (Bob)
 -  . Add -s command line option / stdin command for reading script from stdin.
 -    (Bob)
 -
  - Session:
    . Fixed bug #73273 (session_unset() empties values from all variables in which
      is $_session stored). (Nikita)