com php-src: Fix #68712: suspicious if-else statements: NEWS ext/gd/libgd/gd_interpolation.c

From: Date: Sat, 23 Jul 2016 17:29:43 +0000
Subject: com php-src: Fix #68712: suspicious if-else statements: NEWS ext/gd/libgd/gd_interpolation.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93347@lists.php.net to get a copy of this message
Commit: 88838dd28200b53c4da7a558975b195fd41ba446 Author: Christoph M. Becker <cmb@php.net> Sat, 23 Jul 2016 19:29:43 +0200 Parents: 9fbd0c1ff11aad5c438042928f90879d21e0bec6 Branches: PHP-5.6 PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=88838dd28200b53c4da7a558975b195fd41ba446 Log: Fix #68712: suspicious if-else statements Bugs: https://bugs.php.net/68712 Changed paths: M NEWS M ext/gd/libgd/gd_interpolation.c Diff: diff --git a/NEWS b/NEWS index b3000bd..6fe4d5c 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,7 @@ PHP NEWS . Fixed bug #43828 (broken transparency of imagearc for truecolor in blendingmode). (cmb) . Fixed bug #66555 (Always false condition in ext/gd/libgd/gdkanji.c). (cmb) + . Fixed bug #68712 (suspicious if-else statements). (cmb) - Intl: . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c index 833e7fc..4c11213 100644 --- a/ext/gd/libgd/gd_interpolation.c +++ b/ext/gd/libgd/gd_interpolation.c @@ -1509,13 +1509,8 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co src_offset_y[0] = m; } - if (m < 1) { - src_offset_x[1] = n; - src_offset_y[1] = m; - } else { - src_offset_x[1] = n; - src_offset_y[1] = m; - } + src_offset_x[1] = n; + src_offset_y[1] = m; if ((m < 1) || (n >= src_w - 1)) { src_offset_x[2] = n; @@ -1567,13 +1562,8 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co src_offset_y[8] = m; } - if (m >= src_h - 1) { - src_offset_x[9] = n; - src_offset_y[9] = m; - } else { - src_offset_x[9] = n; - src_offset_y[9] = m; - } + src_offset_x[9] = n; + src_offset_y[9] = m; if ((m >= src_h-1) || (n >= src_w-1)) { src_offset_x[10] = n; @@ -1599,13 +1589,8 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co src_offset_y[12] = m; } - if (m >= src_h - 2) { - src_offset_x[13] = n; - src_offset_y[13] = m; - } else { - src_offset_x[13] = n; - src_offset_y[13] = m; - } + src_offset_x[13] = n; + src_offset_y[13] = m; if ((m >= src_h - 2) || (n >= src_w - 1)) { src_offset_x[14] = n; @@ -2014,13 +1999,8 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const src_offset_y[0] = m; } - if (m < 1) { - src_offset_x[1] = n; - src_offset_y[1] = m; - } else { - src_offset_x[1] = n; - src_offset_y[1] = m ; - } + src_offset_x[1] = n; + src_offset_y[1] = m; if ((m < 1) || (n >= src_w-1)) { src_offset_x[2] = - 1;

« previous php.cvs (#93347) next »