summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-04-19 23:44:00 -0700
committerStanislav Malyshev <stas@php.net>2016-04-19 23:44:00 -0700
commitc02301b666f61e73da3ae73f712823cf64a9299d (patch)
treea656831532dd81edcdc6c87360a7930e5d5da25c
parentf061867fd385109861d128ae6f3e2484fc4daa72 (diff)
downloadphp-git-c02301b666f61e73da3ae73f712823cf64a9299d.tar.gz
Better fix for #71952
-rw-r--r--ext/gd/gd.c10
1 files changed, 7 insertions, 3 deletions
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);