Merge remote-tracking branch 'origin/topic/bbannier/unset-hooks'

zeek · May 15, 2024 · b877696 · b877696
2 parents b41aaeb + 3bf7e97
commit b877696
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,13 @@
+1.11.0-dev.168 | 2024-05-15 10:19:54 +0200
+
+  * Fix behavior for unset accept and decline hooks. (Benjamin Bannier, Corelight)
+
+    We did not properly initialize pointer values for accept and decline
+    hooks. In downstream code they then appeared to be set when they were in
+    fact not.
+
+    With this patch we initialize them with proper defaults.
+
 1.11.0-dev.166 | 2024-05-14 11:54:16 +0200
 
   * Docs: Add new section with guidelines and best practices. (Robin Sommer, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.11.0-dev.166
+1.11.0-dev.168
diff --git a/spicy/runtime/include/configuration.h b/spicy/runtime/include/configuration.h
@@ -20,7 +20,7 @@ struct Configuration {
      * Optional callback to execute when a Spicy parser calls
      * `spicy::accept_input()`.
      **/
-    HookAcceptInput hook_accept_input;
+    HookAcceptInput hook_accept_input = nullptr;
 
     using HookDeclineInput = void (*)(const std::string&);
 
@@ -29,7 +29,7 @@ struct Configuration {
      * `spicy::decline_input()`. This string argument is the reason provided by
      * the caller.
      */
-    HookDeclineInput hook_decline_input;
+    HookDeclineInput hook_decline_input = nullptr;
 };
 
 namespace configuration {