diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
| commit | 5d5c00c67682bce105197b659687fd1fee8f60cf (patch) | |
| tree | 686e41dc3ea121235fb73afb9157ed603f1bfeff /src/plugins/imageformats | |
| parent | f213e818f03d35cb82e3daf187415197fd156f8e (diff) | |
| parent | b82559244e2dc03f1ceff66bb67630df4300dc7c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/gui/painting/qdrawhelper.cpp
Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e
Diffstat (limited to 'src/plugins/imageformats')
| -rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index e61173db30..30935cacda 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -506,6 +506,8 @@ QImage ICOReader::iconAt(int index) icoAttrib.h = iconEntry.bHeight; if (icoAttrib.h == 0) // means 256 pixels icoAttrib.h = header.biHeight/2; + if (icoAttrib.w > 256 || icoAttrib.h > 256) // Max ico size + return img; QImage::Format format = QImage::Format_ARGB32; if (icoAttrib.nbits == 24) |