From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 9 Mar 2018 23:18:14 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.4RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d70992297925e016659f93734f25fa40b00011cd;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #73957: signed integer conversion in imagescale()
---

d70992297925e016659f93734f25fa40b00011cd
diff --cc NEWS
index f068c6ab83,566494414f..cf9a0eddc2
--- a/NEWS
+++ b/NEWS
@@@ -24,7 -28,6 +24,8 @@@ PH
    . Fixed ftp_pasv arginfo. (carusogabriel)
  
  -GD:
++  . Fixed bug #73957 (signed integer conversion in imagescale()). (cmb)
 +  . Fixed bug #76041 (null pointer access crashed php). (cmb)
    . Fixed imagesetinterpolation arginfo. (Gabriel Caruso)
  
  - iconv: