|
|
|
@ -1,10 +1,10 @@
|
|
|
|
|
This file is part of MXE.
|
|
|
|
|
See index.html for further information.
|
|
|
|
|
|
|
|
|
|
From 01ab4dd7d61a047c93164b8d8511ddb31d5740f1 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 90cd274c70f9532cfc58b1a741ccd480715f006d Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Tue, 26 Feb 2013 13:23:33 +0100
|
|
|
|
|
Subject: [PATCH 1/5] use pkg-config for freetype
|
|
|
|
|
Subject: [PATCH 1/4] use pkg-config for freetype
|
|
|
|
|
|
|
|
|
|
Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
|
|
|
|
|
|
|
|
|
@ -21,13 +21,13 @@ index c2b882e..3834d83 100644
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
2.1.0
|
|
|
|
|
2.1.4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From a6a467a7d8e6aaec6197c77887cae7c06f3c8659 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From f43e7ee33db38727c574cf14b42a1d377e91cfd1 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Sat, 18 May 2013 23:07:46 +0200
|
|
|
|
|
Subject: [PATCH 2/5] use pkgconfig for icu detection (MXE specific)
|
|
|
|
|
Subject: [PATCH 2/4] use pkgconfig for icu detection (MXE specific)
|
|
|
|
|
|
|
|
|
|
Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3
|
|
|
|
|
|
|
|
|
@ -55,13 +55,13 @@ index 16267ff..dd9fb6c 100644
|
|
|
|
|
+CONFIG += link_pkgconfig
|
|
|
|
|
+PKGCONFIG += icu-i18n
|
|
|
|
|
--
|
|
|
|
|
2.1.0
|
|
|
|
|
2.1.4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From eed2ebcf407f7e674447917f9657a689d0d2233f Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 536262f746f5110edf5c50949a4ce1c94bd8b8e4 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Sat, 21 Jun 2014 13:12:49 +0200
|
|
|
|
|
Subject: [PATCH 3/5] use pkg-config for harfbuzz (MXE specific)
|
|
|
|
|
Subject: [PATCH 3/4] use pkg-config for harfbuzz (MXE specific)
|
|
|
|
|
|
|
|
|
|
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
|
|
|
|
|
|
|
|
|
@ -88,13 +88,13 @@ index 7443368..c24e684 100644
|
|
|
|
|
+ PKGCONFIG += harfbuzz
|
|
|
|
|
}
|
|
|
|
|
--
|
|
|
|
|
2.1.0
|
|
|
|
|
2.1.4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From 315a827326804cd76b43aa01597dc761bb75268e Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 8f057f09c41b12133643a3080cca0076b9153d05 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Mon, 8 Dec 2014 14:15:12 +0100
|
|
|
|
|
Subject: [PATCH 4/5] fix oci config test on windows
|
|
|
|
|
Subject: [PATCH 4/4] fix oci config test on windows
|
|
|
|
|
|
|
|
|
|
Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
|
|
|
|
|
|
|
|
|
@ -108,49 +108,5 @@ index 3ffda1d..39b6f3759 100644
|
|
|
|
|
-LIBS += -lclntsh
|
|
|
|
|
+!win32:LIBS += -lclntsh
|
|
|
|
|
--
|
|
|
|
|
2.1.0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From 22e870578fbf6d25178674fdc6ff032257459eb9 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: "Richard J. Moore" <rich@kde.org>
|
|
|
|
|
Date: Sat, 21 Feb 2015 17:43:21 +0000
|
|
|
|
|
Subject: [PATCH 5/5] 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>
|
|
|
|
|
(cherry picked from commit 661f6bfd032dacc62841037732816a583640e187)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
|
|
|
|
|
index 21c1a2f..df66499 100644
|
|
|
|
|
--- a/src/gui/image/qbmphandler.cpp
|
|
|
|
|
+++ b/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;
|
|
|
|
|
--
|
|
|
|
|
2.1.0
|
|
|
|
|
2.1.4
|
|
|
|
|
|
|
|
|
|