Merge remote-tracking branch 'origin/topic/timw/fix-cookie'

* origin/topic/timw/fix-cookie: Avoid dereferencing cookie field that could intentionally be unset
zeek · Dec 12, 2023 · 9eba4fb · 9eba4fb
2 parents 02097a6 + 6cd85d5
commit 9eba4fb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.3.0-dev.61 | 2023-12-12 10:33:37 -0700
+
+  * Avoid dereferencing cookie field that could intentionally be unset
+
 2.3.0-dev.59 | 2023-12-11 09:56:46 -0700
 
   * Merge branch 'topic/timw/fix-timestamp-parsing'

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.3.0-dev.59
+2.3.0-dev.61
diff --git a/src/io/zeek.cc b/src/io/zeek.cc
@@ -1268,7 +1268,7 @@ void ZeekConnection::processEvent(const std::string& name, const std::vector<Val
                                    .requires_tables = std::move(requires_tables),
                                    .if_missing_tables = std::move(if_missing_tables),
                                    .terminate = false,
-                                   .cookie = *cookie,
+                                   .cookie = cookie,
                                }};
         } catch ( const std::exception& e ) {
             unexpectedEventArguments(zeek_instance_id, name, args);