summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2021-08-04 10:53:02 +0200
committerMarc Mutz <marc.mutz@kdab.com>2021-08-06 13:50:39 +0200
commit71334c324e702c434d446e5fc329294c97b8516d (patch)
treea05fa52a68bedbb05d49abc08d728cd96d2d6baf /src/tools
parent066dd1cdc0660d2e47bbcbad3c119d7029e08ecc (diff)
QXpmHandler: actually limit characters-per-pixel to four
The following code assumed, and all comments indicated, that the cpp variable was limited to a max of 4. Yet, as coded, cpp could be five, in which case the XPM would be corrupt, as the header suggested five characters-per-pixel while the data was formatted in only four. Add a warning and error out when we encounter this situation. [ChangeLog][QtGui][QImage] Instead of writing a corrupt file, rejects to write XPM files with more than 64^4 colors (more than four characters per pixel) now. Pick-to: 6.2 6.1 5.15 5.12 Change-Id: I458873cf7d179ab2e2dacd4c17dc837d640591a9 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
0 files changed, 0 insertions, 0 deletions