diff --git a/CHANGES b/CHANGES index d337c90876..78af26aab8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.2.0-dev.199 | 2025-02-14 11:28:48 -0800 + + * Do not export locals (Evan Typanski, Corelight) + + * DPD changes - ZAM baseline updates (Johanna Amann, Corelight) + 7.2.0-dev.194 | 2025-02-07 07:31:26 +0000 * Allow to track service violations in conn.log. (Johanna Amann, Corelight) diff --git a/VERSION b/VERSION index c1a191fb28..403127d47a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0-dev.194 +7.2.0-dev.199 diff --git a/src/parse.y b/src/parse.y index e02f2316e3..bc90f20dec 100644 --- a/src/parse.y +++ b/src/parse.y @@ -2212,7 +2212,7 @@ local_id: else { $$ = install_ID($1, current_module.c_str(), - false, is_export).release(); + false, false).release(); } } ; diff --git a/testing/btest/Baseline/language.locals-to-global/.stdout b/testing/btest/Baseline/language.locals-to-global/.stdout new file mode 100644 index 0000000000..da34ee5ec1 --- /dev/null +++ b/testing/btest/Baseline/language.locals-to-global/.stdout @@ -0,0 +1,3 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +one +two diff --git a/testing/btest/language/locals-to-global.zeek b/testing/btest/language/locals-to-global.zeek new file mode 100644 index 0000000000..a6f75d1aa8 --- /dev/null +++ b/testing/btest/language/locals-to-global.zeek @@ -0,0 +1,24 @@ +# @TEST-DOC: Ensure that locals are not hoisted to global scope. +# @TEST-EXEC: zeek -b %INPUT +# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stdout + +module Test; + +export { + function func1() + { + local t: string = "one"; + print t; + } + function func2() + { + local t: string = "two"; + print t; + } +} + +event zeek_init() + { + func1(); + func2(); + }