com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/gd/gd.c

Commit: c930714cbed793ad8272b664dbadaba5477ae40a Author: Christoph M. Becker <cmbecker69@gmx.de> Sun, 9 Oct 2016 15:13:32 +0200 Parents: 6f84ac721b2674dc056430c420c839f4d2fe5b74 b92216b97dcdae738ae24d9bdd1168565dc04406 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c930714cbed793ad8272b664dbadaba5477ae40a Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM NEWS MM ext/gd/gd.c Diff: diff --cc NEWS index 8117d60,a41168d..acf5850 --- a/NEWS +++ b/NEWS @@@ -1,20 -1,12 +1,22 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2016, PHP 5.6.28 +?? ??? 2016 PHP 7.0.13 --GD: +- Core: + . Fixed bug #73181 (parse_str() without a second argument leads to crash). + (Nikita) + . Fixed bug #66773 (Autoload with Opcache allows importing conflicting class + name to namespace). (Nikita) + . Fixed bug #66862 ((Sub-)Namespaces unexpected behaviour). (Nikita) + +- GD: . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb) + . Fixed bug #73272 (imagescale() is not affected by, but affects + imagesetinterpolation()). (cmb) +- phpdbg: + . Properly allow for stdin input from a file. (Bob) + - Standard: . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb) diff --cc ext/gd/gd.c index 62433c5,39cb4eb..2aa03a9 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -4694,10 -5174,10 +4694,10 @@@ PHP_FUNCTION(imagescale gdImagePtr im; gdImagePtr im_scaled = NULL; int new_width, new_height; - long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED; + zend_long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED; - gdInterpolationMethod method; + gdInterpolationMethod method, old_method; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|ll", &IM, &tmp_w, &tmp_h, &tmp_m) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|ll", &IM, &tmp_w, &tmp_h, &tmp_m) == FAILURE) { return; } method = tmp_m;