From ba9b2250a69af2349ab65425cbcfaa986962899c Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@online.no>
Date: Fri, 23 Apr 2021 22:03:46 +0200
Subject: Avoid heap usage after free in lid space compaction unit test.

---
 .../tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp  | 2 +-
 .../tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
index 04650ad7086..d394769c0ee 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
@@ -30,10 +30,10 @@ struct MyCountJobRunner : public IMaintenanceJobRunner {
 JobTestBase::JobTestBase()
     : _refCount(),
       _clusterStateHandler(),
+      _diskMemUsageNotifier(),
       _handler(),
       _storer(),
       _frozenHandler(),
-      _diskMemUsageNotifier(),
       _job()
 {
     init(ALLOWED_LID_BLOAT, ALLOWED_LID_BLOAT_FACTOR, RESOURCE_LIMIT_FACTOR, JOB_DELAY, false, MAX_OUTSTANDING_MOVE_OPS);
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
index 9d622495bd2..dde48a0a620 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
@@ -11,13 +11,13 @@ namespace storage::spi::dummy { class DummyBucketExecutor; }
 struct JobTestBase : public ::testing::TestWithParam<bool> {
     MonitoredRefCount _refCount;
     test::ClusterStateHandler _clusterStateHandler;
+    test::DiskMemUsageNotifier _diskMemUsageNotifier;
     std::unique_ptr<storage::spi::dummy::DummyBucketExecutor> _bucketExecutor;
     std::unique_ptr<vespalib::SyncableThreadExecutor> _singleExecutor;
     std::unique_ptr<searchcorespi::index::IThreadService> _master;
     std::shared_ptr<MyHandler> _handler;
     MyStorer _storer;
     MyFrozenBucketHandler _frozenHandler;
-    test::DiskMemUsageNotifier _diskMemUsageNotifier;
     std::shared_ptr<BlockableMaintenanceJob> _job;
     JobTestBase();
     ~JobTestBase() override;
-- 
cgit v1.2.3