diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-26 11:11:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 11:11:17 +0100 |
| commit | 88330f8df080a9204aa13b5668e2e9754f6e279d (patch) | |
| tree | 87d6001442e81b156067e88a9cd70d543a69e0b5 | |
| parent | db637ffe7938cee15560cd94f7740c523d18bab4 (diff) | |
| parent | a4d8ea7b6d2e66526b837eb8540aae532824802d (diff) | |
Merge pull request #15032 from vespa-engine/vekterli/avoid-mergehandler-spam-log-level-crash
Don't try to access container element prior to adding it when spam logging
| -rw-r--r-- | storage/src/vespa/storage/persistence/mergehandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp index 4fe7333fb5f..c7c681a838b 100644 --- a/storage/src/vespa/storage/persistence/mergehandler.cpp +++ b/storage/src/vespa/storage/persistence/mergehandler.cpp @@ -403,9 +403,9 @@ MergeHandler::fetchLocalData( || (entries.empty() && alreadyFilled == 0)) { remainingSize -= entry->getSize(); + entries.push_back(std::move(entry)); LOG(spam, "Added %s, remainingSize is %u", entries.back()->toString().c_str(), remainingSize); - entries.push_back(std::move(entry)); } else { LOG(spam, "Adding %s would exceed chunk size limit of %u; " "not filling up any more diffs for current round", |