diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-06 09:36:49 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-06 09:37:40 +0100 |
| commit | f799f42ec818659a2434dc0f7281ce755592391a (patch) | |
| tree | 728ee3f81cc72352d5575541e4815b7d6d2cf1eb /ext/gd/libgd/gd_interpolation.c | |
| parent | f4aa0869acfd871f780ecf378f84f68a4755267e (diff) | |
| parent | 2c5860517c4a1f7ebc81ef79858aa5aff5aad76c (diff) | |
| download | php-git-f799f42ec818659a2434dc0f7281ce755592391a.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79067: gdTransformAffineCopy() may use unitialized values
Diffstat (limited to 'ext/gd/libgd/gd_interpolation.c')
| -rw-r--r-- | ext/gd/libgd/gd_interpolation.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c index 015f859e2b..e6d672ec8f 100644 --- a/ext/gd/libgd/gd_interpolation.c +++ b/ext/gd/libgd/gd_interpolation.c @@ -2289,7 +2289,7 @@ int gdTransformAffineGetImage(gdImagePtr *dst, * src_area - Rectangular region to rotate in the src image * * Returns: - * GD_TRUE if the affine is rectilinear or GD_FALSE + * GD_TRUE on success or GD_FALSE on failure */ int gdTransformAffineCopy(gdImagePtr dst, int dst_x, int dst_y, @@ -2346,7 +2346,10 @@ int gdTransformAffineCopy(gdImagePtr dst, end_y = bbox.height + abs(bbox.y); /* Get inverse affine to let us work with destination -> source */ - gdAffineInvert(inv, affine); + if (gdAffineInvert(inv, affine) == GD_FALSE) { + gdImageSetInterpolationMethod(src, interpolation_id_bak); + return GD_FALSE; + } src_offset_x = src_region->x; src_offset_y = src_region->y; |