From: Stanislav Malyshev <stas@php.net>
Date: Wed, 20 Apr 2016 06:44:00 +0000 (-0700)
Subject: Better fix for #71952
X-Git-Tag: php-7.0.7RC1~91^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c02301b666f61e73da3ae73f712823cf64a9299d;p=php

Better fix for #71952
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index df0a32f1ab..0fce8ddcdf 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -5363,10 +5363,14 @@ PHP_FUNCTION(imageaffinematrixget)
 				RETURN_FALSE;
 			}
 			if(Z_TYPE_P(options) != IS_DOUBLE) {
-				Z_ADDREF_P(options);
-				convert_to_double_ex(&options);
+				zval dval;
+				dval = *options;
+				zval_copy_ctor(&dval);
+				convert_to_double(&dval);
+				angle = Z_DVAL(dval);
+			} else {
+				angle = Z_DVAL_P(options);
 			}
-			angle = Z_DVAL_P(options);
 
 			if (type == GD_AFFINE_SHEAR_HORIZONTAL) {
 				res = gdAffineShearHorizontal(affine, angle);