diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-03-04 23:06:13 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-03-04 23:06:13 +0000 |
| commit | 5d9d0e2d2cfe8bf45186697ec6020fdc0b014143 (patch) | |
| tree | b04c5ecbcd8f03dd3d88edad5ca494c1a600f013 /x11-toolkits/qt5-gui | |
| parent | 84bc960e23f64b7640c3f251f0d8958561856e33 (diff) | |
Notes
Diffstat (limited to 'x11-toolkits/qt5-gui')
| -rw-r--r-- | x11-toolkits/qt5-gui/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 | 37 |
2 files changed, 38 insertions, 1 deletions
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index 52216e5c0dc8..61b0f87973d3 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -2,7 +2,7 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 b/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 new file mode 100644 index 000000000000..5a32eb93b026 --- /dev/null +++ b/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 @@ -0,0 +1,37 @@ +commit 661f6bfd032dacc62841037732816a583640e187 +Author: Richard J. Moore <rich@kde.org> +Date: Sat Feb 21 17:43:21 2015 +0000 + + Fix a division by zero when processing malformed BMP files. + + This fixes a division by 0 when processing a maliciously crafted BMP + file. No impact beyond DoS. + + Task-number: QTBUG-44547 + Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973 + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> + +--- src/gui/image/qbmphandler.cpp ++++ src/gui/image/qbmphandler.cpp +@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + } + } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { + red_shift = calc_shift(red_mask); ++ if (((red_mask >> red_shift) + 1) == 0) ++ return false; + red_scale = 256 / ((red_mask >> red_shift) + 1); + green_shift = calc_shift(green_mask); ++ if (((green_mask >> green_shift) + 1) == 0) ++ return false; + green_scale = 256 / ((green_mask >> green_shift) + 1); + blue_shift = calc_shift(blue_mask); ++ if (((blue_mask >> blue_shift) + 1) == 0) ++ return false; + blue_scale = 256 / ((blue_mask >> blue_shift) + 1); + alpha_shift = calc_shift(alpha_mask); ++ if (((alpha_mask >> alpha_shift) + 1) == 0) ++ return false; + alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1); + } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { + blue_mask = 0x000000ff; |