diff options
| author | Remi Collet <remi@php.net> | 2014-03-12 13:47:36 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-03-12 13:47:36 +0100 |
| commit | ee06def81bf9f887d1a3b5acf1c8fff4700a140f (patch) | |
| tree | 6f86ef8213be602a03d8e66f72051f527913f1cd /ext | |
| parent | f35aba18742aaae405e50c83a5d00971c7c8a30c (diff) | |
| parent | 081e2b99285b362dd036443f244ce8192603b2a4 (diff) | |
| download | php-git-ee06def81bf9f887d1a3b5acf1c8fff4700a140f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fixed Bug #66890 imagescale segfault
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gd/gd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 8e205897cb..9809b1590b 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -5110,12 +5110,16 @@ PHP_FUNCTION(imagescale) zval *IM; gdImagePtr im; gdImagePtr im_scaled; - int new_width, new_height = -1; - gdInterpolationMethod method = GD_BILINEAR_FIXED; + int new_width, new_height; + long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED; + gdInterpolationMethod method; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|ll", &IM, &new_width, &new_height, &method) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|ll", &IM, &tmp_w, &tmp_h, &tmp_m) == FAILURE) { return; } + method = tmp_m; + new_width = tmp_w; + new_height = tmp_h; ZEND_FETCH_RESOURCE(im, gdImagePtr, &IM, -1, "Image", le_gd); im_scaled = gdImageScale(im, new_width, new_height); |