diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-27 10:27:10 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-01 12:20:39 +0200 |
| commit | e750fa8509d350cbbcddc81174516745f6ffe9f3 (patch) | |
| tree | 76d6c9b10395a43c800ce59adfd898e39e564e47 /src/gui/painting/qicc.cpp | |
| parent | fe36d47b371b71ad5fec30d4b5d7bf0baa0205ea (diff) | |
Do not assert on invalid ICC curv table
Reject invalid table data, do not assert it.
Pick-to: 5.15
Change-Id: I1fdda4c735bb97bb93ac8f8654ac4cc5fada5389
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui/painting/qicc.cpp')
| -rw-r--r-- | src/gui/painting/qicc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qicc.cpp b/src/gui/painting/qicc.cpp index 7cf5e36073..746ef43692 100644 --- a/src/gui/painting/qicc.cpp +++ b/src/gui/painting/qicc.cpp @@ -489,7 +489,10 @@ bool parseTRC(const QByteArray &data, const TagEntry &tagEntry, QColorTrc &gamma qFromBigEndian<quint16>(data.constData() + offset, curv.valueCount, tabl.data()); QColorTransferTable table = QColorTransferTable(curv.valueCount, std::move(tabl)); QColorTransferFunction curve; - if (!table.asColorTransferFunction(&curve)) { + if (!table.checkValidity()) { + qCWarning(lcIcc) << "Invalid curv table"; + return false; + } else if (!table.asColorTransferFunction(&curve)) { gamma.m_type = QColorTrc::Type::Table; gamma.m_table = table; } else { |