From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 19 Jan 2019 09:17:20 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.2RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1907cbd8b3cd63a325a5c6d0ba6f3af2267368c1;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77479: imagewbmp() segfaults with very large images
---

1907cbd8b3cd63a325a5c6d0ba6f3af2267368c1
diff --cc NEWS
index 228c371c3e,31e73b5ecc..f6681d5645
--- a/NEWS
+++ b/NEWS
@@@ -34,10 -14,9 +34,11 @@@ PH
    . Fixed bug #73614 (gdImageFilledArc() doesn't properly draw pies). (cmb)
    . Fixed bug #77272 (imagescale() may return image resource on failure). (cmb)
    . Fixed bug #77391 (1bpp BMPs may fail to be loaded). (Romain Déoux, cmb)
+   . Fixed bug #77479 (imagewbmp() segfaults with very large images). (cmb)
  
  - Mbstring:
 +  . Fixed bug #77428 (mb_ereg_replace() doesn't replace a substitution
 +    variable). (Nikita)
    . Fixed bug #77454 (mb_scrub() silently truncates after a null byte).
      (64796c6e69 at gmail dot com)