diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:02:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:02:11 +0200 |
| commit | a1e413909fed9a013178e62b922ff5b98326eb6b (patch) | |
| tree | 08a7f861d0725263eb2aa5c695efd206f16efcce | |
| parent | 82a6d3426215253e013dd3ddd6712488388bc926 (diff) | |
| parent | d2c3b5be968c1f7681c63f673546a8107ae2d06d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
| -rw-r--r-- | src/plugins/imageformats/webp/qwebphandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp index 4d6bcbe..454d654 100644 --- a/src/plugins/imageformats/webp/qwebphandler.cpp +++ b/src/plugins/imageformats/webp/qwebphandler.cpp @@ -218,6 +218,10 @@ bool QWebpHandler::write(const QImage &image) qWarning() << "source image is null."; return false; } + if (std::max(image.width(), image.height()) > WEBP_MAX_DIMENSION) { + qWarning() << "QWebpHandler::write() source image too large for WebP: " << image.size(); + return false; + } QImage srcImage = image; bool alpha = srcImage.hasAlphaChannel(); |