From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 21 Jan 2017 12:10:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a2497b2c510f5272c5349866b64ef16a7204167;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #73968: Premature failing of XBM reading
---

7a2497b2c510f5272c5349866b64ef16a7204167
diff --cc NEWS
index 74af8c58d5,d96e7bec90..7ad8924be0
--- a/NEWS
+++ b/NEWS
@@@ -12,10 -11,13 +12,13 @@@ PH
  - DTrace:
    . Fixed bug #73965 (DTrace reported as enabled when disabled). (Remi)
  
 -- FPM:
 -  . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
 -    (Dmitry Saprykin)
 +- FCGI:
 +  . Fixed bug #73904 (php-cgi fails to load -c specified php.ini file). (Anatol)
 +  . Fixed bug #72898 (PHP_FCGI_CHILDREN is not included in phpinfo()). (Anatol)
  
+ - GD:
+   . Fixed bug #73968 (Premature failing of XBM reading). (cmb)
+ 
  - GMP:
    . Fixed bug #69993 (test for gmp.h needs to test machine includes).
      (Jordan Gigov) 
diff --cc ext/gd/tests/libgd00094-mb.phpt
index a5e55baa96,0000000000..c18b4fd3d1
mode 100644,000000..100644
--- a/ext/gd/tests/libgd00094-mb.phpt
+++ b/ext/gd/tests/libgd00094-mb.phpt
@@@ -1,19 -1,0 +1,16 @@@
 +--TEST--
 +libgd #94 (imagecreatefromxbm can crash if gdImageCreate fails)
 +--SKIPIF--
 +<?php
 +	if (!extension_loaded('gd')) die("skip gd extension not available\n");
 +	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 +?>
 +--FILE--
 +<?php
 +$im = imagecreatefromxbm(dirname(__FILE__) . '/libgd00094私はガラスを食べられます.xbm');
 +var_dump($im);
 +?>
 +--EXPECTF--
- Warning: imagecreatefromxbm(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
-  in %slibgd00094-mb.php on line %d
- 
 +Warning: imagecreatefromxbm(): '%slibgd00094私はガラスを食べられます.xbm' is not a valid XBM file in %slibgd00094-mb.php on line %d
 +bool(false)
 +