summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qicc.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-18 15:19:06 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-19 09:31:35 +0200
commitdddd0c3ad80b08e4e7775095e51995f360b5e336 (patch)
tree2506426b25aa5313f6f58692bd040dbd6bc17d89 /src/gui/painting/qicc.cpp
parentcdfafec01bc13bfe730a30893a5ade5fd2d238e6 (diff)
Add error message on unaligned profile inputs
Pick-to: 5.15 Task-number: QTBUG-84267 Change-Id: I7ec2100455bd0178cdff0de2d24abbe6c19f812f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui/painting/qicc.cpp')
-rw-r--r--src/gui/painting/qicc.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/painting/qicc.cpp b/src/gui/painting/qicc.cpp
index ca06e8763f..32d67ea76a 100644
--- a/src/gui/painting/qicc.cpp
+++ b/src/gui/painting/qicc.cpp
@@ -614,6 +614,11 @@ bool parseDesc(const QByteArray &data, const TagEntry &tagEntry, QString &descNa
bool fromIccProfile(const QByteArray &data, QColorSpace *colorSpace)
{
+ Q_ASSERT((reinterpret_cast<qintptr>(data.constData()) & 0x3) == 0);
+ if (reinterpret_cast<qintptr>(data.constData()) & 0x3) {
+ qCWarning(lcIcc) << "fromIccProfile: Unaligned profile data";
+ return false;
+ }
if (data.size() < qsizetype(sizeof(ICCProfileHeader))) {
qCWarning(lcIcc) << "fromIccProfile: failed size sanity 1";
return false;