From bfcb68f8e7afc2c5788b3f58db4f48c21e9350de Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Fri, 23 May 2025 16:16:11 +0200
Subject: [PATCH] Event: Move meta after args

---
 src/Event.cc | 8 ++++----
 src/Event.h  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Event.cc b/src/Event.cc
index 51bcc00a15..c6af18be0d 100644
--- a/src/Event.cc
+++ b/src/Event.cc
@@ -44,21 +44,21 @@ Event::Event(const EventHandlerPtr& arg_handler, zeek::Args arg_args, util::deta
              analyzer::ID arg_aid, Obj* arg_obj, double arg_ts)
     : handler(arg_handler),
       args(std::move(arg_args)),
+      meta(detail::MakeEventMetadataVector(arg_ts)),
       src(arg_src),
       aid(arg_aid),
       obj(zeek::NewRef{}, arg_obj),
-      next_event(nullptr),
-      meta(detail::MakeEventMetadataVector(arg_ts)) {}
+      next_event(nullptr) {}
 
 Event::Event(detail::EventMetadataVectorPtr arg_meta, const EventHandlerPtr& arg_handler, zeek::Args arg_args,
              util::detail::SourceID arg_src, analyzer::ID arg_aid, Obj* arg_obj)
     : handler(arg_handler),
       args(std::move(arg_args)),
+      meta(std::move(arg_meta)),
       src(arg_src),
       aid(arg_aid),
       obj(zeek::NewRef{}, arg_obj),
-      next_event(nullptr),
-      meta(std::move(arg_meta)) {}
+      next_event(nullptr) {}
 
 zeek::VectorValPtr Event::MetadataValues(const EnumValPtr& id) const {
     static const auto& any_vec_t = zeek::id::find_type<zeek::VectorType>("any_vec");
diff --git a/src/Event.h b/src/Event.h
index 109a01bbfe..49c78dae6f 100644
--- a/src/Event.h
+++ b/src/Event.h
@@ -93,11 +93,11 @@ private:
 
     EventHandlerPtr handler;
     zeek::Args args;
+    detail::EventMetadataVectorPtr meta;
     util::detail::SourceID src;
     analyzer::ID aid;
     zeek::IntrusivePtr<Obj> obj;
     Event* next_event;
-    detail::EventMetadataVectorPtr meta;
 };
 
 class EventMgr final : public Obj, public iosource::IOSource {