From d117cd5f3a028a33eb93fd037f8255d71cb95a8a Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 30 Jun 2023 21:23:47 +0200 Subject: [PATCH] QPixmapCache: ignore insertion or searches with empty key When a key for a pixmap cannot be generated, then the only meaningful way to indicate that failure is to return an empty string. Instead of plastering checks for the generated key being empty all over our styling code, reject attempts to insert a pixmap with an empty key string in the QPixmapCache, and fail to find immediately. Such a key makes no sense either way. [ChangeLog][Gui][QPixmapCache] Trying to insert or find a pixmap with an empty key string now always fails immediately. Task-number: QTBUG-114473 Change-Id: I15bf8064ac7a4fe715722d98f2df2b8608809c7f Reviewed-by: Axel Spoerl (cherry picked from commit 79abdd3cd496b472f0a6140fcf94e68ff79fda2b) Reviewed-by: Qt Cherry-pick Bot --- src/gui/image/qpixmapcache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 46398582568..4637b38dd79 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -428,7 +428,7 @@ QPixmapCacheEntry::~QPixmapCacheEntry() bool QPixmapCache::find(const QString &key, QPixmap *pixmap) { - if (!qt_pixmapcache_thread_test()) + if (key.isEmpty() || !qt_pixmapcache_thread_test()) return false; QPixmap *ptr = pm_cache()->object(key); if (ptr && pixmap) @@ -480,7 +480,7 @@ bool QPixmapCache::find(const Key &key, QPixmap *pixmap) bool QPixmapCache::insert(const QString &key, const QPixmap &pixmap) { - if (!qt_pixmapcache_thread_test()) + if (key.isEmpty() || !qt_pixmapcache_thread_test()) return false; return pm_cache()->insert(key, pixmap, cost(pixmap)); } @@ -562,7 +562,7 @@ void QPixmapCache::setCacheLimit(int n) */ void QPixmapCache::remove(const QString &key) { - if (!qt_pixmapcache_thread_test()) + if (key.isEmpty() || !qt_pixmapcache_thread_test()) return; pm_cache()->remove(key); }