Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78923: Artifacts when convoluting image with transparency

Author: cmb69

NEWS

@@ -15,6 +15,8 @@ PHP                                                                        NEWS
 
 - GD:
   . Fixed bug #78849 (GD build broken with -D SIGNED_COMPARE_SLOW). (cmb)
+  . Fixed bug #78923 (Artifacts when convoluting image with transparency).
+    (wilson chen)
 
 - FPM:
   . Fixed bug #76601 (Partially working php-fpm ater incomplete reload).

ext/gd/libgd/gd_filter.c

@@ -362,6 +362,7 @@ int gdImageConvolution(gdImagePtr src, float filter[3][3], float filter_div, flo
 	for ( y=0; y<src->sy; y++) {
 		for(x=0; x<src->sx; x++) {
 			new_r = new_g = new_b = 0;
+			pxl = f(srcback, x, y);
 			new_a = gdImageAlpha(srcback, pxl);
 
 			for (j=0; j<3; j++) {

ext/gd/tests/bug47946.phpt

@@ -1,11 +1,9 @@
 --TEST--
 Bug #47946 (ImageConvolution overwrites background)
---DESCRIPTION--
-The expected image has black pixel artifacts, what is another issue, though
-(perhaps #40158).
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream fix not yet released');
 ?>
 --FILE--
 <?php