summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qcache.h
diff options
context:
space:
mode:
authorMÃ¥rten Nordheim <marten.nordheim@qt.io>2021-01-12 17:25:03 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-14 13:44:30 +0000
commitbaa035684998616ec47bd4812fa24d25d1f5da2b (patch)
tree446ffc37058118e708ea8530864b3182ca5305fa /src/corelib/tools/qcache.h
parent9e4d9fca8a5ed0a10033345bc88b4ae39d20b952 (diff)
QCache: when overwriting, store the new cost instead of the delta
The delta was clearly intended to be used on the total (and still is) but it also wound up getting stored in the cache, which wouldn't be a big problem unless the object was removed, in which case we could incidentally 'free up more space' than intended. Change-Id: Ib2b0f072d30da6d16a93dce60e4c5f6080c109fc Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit d2e2d0d3a6249ccbc17ec92acb32fec9a0d71807) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/tools/qcache.h')
-rw-r--r--src/corelib/tools/qcache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index 41cf9abc46..8a341c8555 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -245,8 +245,9 @@ public:
auto result = d.findOrInsert(key);
Node *n = result.it.node();
if (result.initialized) {
- cost -= n->value.cost;
+ auto prevCost = n->value.cost;
result.it.node()->emplace(object, cost);
+ cost -= prevCost;
relink(key);
} else {
Node::createInPlace(n, key, object, cost);