From e1a39d27f34672a149773329f93c0afb96d2ddbb Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Fri, 21 Aug 2020 15:37:59 -0700 Subject: [PATCH] GH-710: Check that &expire_func is a function and not hook/event --- src/Attr.cc | 9 +++++++++ .../language.expire-func-type-check/output | 3 +++ testing/btest/language/expire-func-type-check.zeek | 14 ++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 testing/btest/Baseline/language.expire-func-type-check/output create mode 100644 testing/btest/language/expire-func-type-check.zeek diff --git a/src/Attr.cc b/src/Attr.cc index 8f6b54a13c..537c04a24f 100644 --- a/src/Attr.cc +++ b/src/Attr.cc @@ -512,10 +512,19 @@ void Attributes::CheckAttr(Attr* a) const auto& expire_func = a->GetExpr(); if ( expire_func->GetType()->Tag() != TYPE_FUNC ) + { Error("&expire_func attribute is not a function"); + break; + } const FuncType* e_ft = expire_func->GetType()->AsFuncType(); + if ( e_ft->Flavor() != FUNC_FLAVOR_FUNCTION ) + { + Error("&expire_func attribute is not a function"); + break; + } + if ( e_ft->Yield()->Tag() != TYPE_INTERVAL ) { Error("&expire_func must yield a value of type interval"); diff --git a/testing/btest/Baseline/language.expire-func-type-check/output b/testing/btest/Baseline/language.expire-func-type-check/output new file mode 100644 index 0000000000..a1beba1f27 --- /dev/null +++ b/testing/btest/Baseline/language.expire-func-type-check/output @@ -0,0 +1,3 @@ +error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.expire-func-type-check/expire-func-type-check.zeek, line 12: &expire_func attribute is not a function (&expire_func=myev) +error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.expire-func-type-check/expire-func-type-check.zeek, line 13: &expire_func attribute is not a function (&expire_func=myhk) +error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.expire-func-type-check/expire-func-type-check.zeek, line 14: &expire_func attribute is not a function (&expire_func=foo) diff --git a/testing/btest/language/expire-func-type-check.zeek b/testing/btest/language/expire-func-type-check.zeek new file mode 100644 index 0000000000..a6126806f2 --- /dev/null +++ b/testing/btest/language/expire-func-type-check.zeek @@ -0,0 +1,14 @@ +# @TEST-EXEC-FAIL: zeek -b %INPUT >output 2>&1 +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output + +event myev(t: table[string] of count) + { } + +hook myhk(t: table[string] of count) + { } + +global foo = 3; + +global t: table[string] of count &expire_func=myev; +global tt: table[string] of count &expire_func=myhk; +global ttt: table[string] of count &expire_func=foo;