Skip to content

Commit 88838dd

Browse files
committed
Fix #68712: suspicious if-else statements
1 parent 9fbd0c1 commit 88838dd

File tree

2 files changed

+9
-28
lines changed

2 files changed

+9
-28
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ PHP NEWS
3333
. Fixed bug #43828 (broken transparency of imagearc for truecolor in
3434
blendingmode). (cmb)
3535
. Fixed bug #66555 (Always false condition in ext/gd/libgd/gdkanji.c). (cmb)
36+
. Fixed bug #68712 (suspicious if-else statements). (cmb)
3637

3738
- Intl:
3839
. Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain

ext/gd/libgd/gd_interpolation.c

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,13 +1509,8 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co
15091509
src_offset_y[0] = m;
15101510
}
15111511

1512-
if (m < 1) {
1513-
src_offset_x[1] = n;
1514-
src_offset_y[1] = m;
1515-
} else {
1516-
src_offset_x[1] = n;
1517-
src_offset_y[1] = m;
1518-
}
1512+
src_offset_x[1] = n;
1513+
src_offset_y[1] = m;
15191514

15201515
if ((m < 1) || (n >= src_w - 1)) {
15211516
src_offset_x[2] = n;
@@ -1567,13 +1562,8 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co
15671562
src_offset_y[8] = m;
15681563
}
15691564

1570-
if (m >= src_h - 1) {
1571-
src_offset_x[9] = n;
1572-
src_offset_y[9] = m;
1573-
} else {
1574-
src_offset_x[9] = n;
1575-
src_offset_y[9] = m;
1576-
}
1565+
src_offset_x[9] = n;
1566+
src_offset_y[9] = m;
15771567

15781568
if ((m >= src_h-1) || (n >= src_w-1)) {
15791569
src_offset_x[10] = n;
@@ -1599,13 +1589,8 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co
15991589
src_offset_y[12] = m;
16001590
}
16011591

1602-
if (m >= src_h - 2) {
1603-
src_offset_x[13] = n;
1604-
src_offset_y[13] = m;
1605-
} else {
1606-
src_offset_x[13] = n;
1607-
src_offset_y[13] = m;
1608-
}
1592+
src_offset_x[13] = n;
1593+
src_offset_y[13] = m;
16091594

16101595
if ((m >= src_h - 2) || (n >= src_w - 1)) {
16111596
src_offset_x[14] = n;
@@ -2014,13 +1999,8 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const
20141999
src_offset_y[0] = m;
20152000
}
20162001

2017-
if (m < 1) {
2018-
src_offset_x[1] = n;
2019-
src_offset_y[1] = m;
2020-
} else {
2021-
src_offset_x[1] = n;
2022-
src_offset_y[1] = m ;
2023-
}
2002+
src_offset_x[1] = n;
2003+
src_offset_y[1] = m;
20242004

20252005
if ((m < 1) || (n >= src_w-1)) {
20262006
src_offset_x[2] = - 1;

0 commit comments

Comments
 (0)