From 07ecd31bbdcb85db52a206cb24ced7ea9b32c9f7 Mon Sep 17 00:00:00 2001 From: Bernhard Amann Date: Sun, 28 Apr 2013 21:21:22 -0700 Subject: [PATCH] in cluster settings, the resultvals can apparently been uninitialized in some special cases --- .../base/frameworks/sumstats/plugins/topk.bro | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/base/frameworks/sumstats/plugins/topk.bro b/scripts/base/frameworks/sumstats/plugins/topk.bro index a830b1c5ec..ed6074b081 100644 --- a/scripts/base/frameworks/sumstats/plugins/topk.bro +++ b/scripts/base/frameworks/sumstats/plugins/topk.bro @@ -35,8 +35,18 @@ hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal) { - result$topk = topk_init(topk_size(rv1$topk)); + if ( rv1?$topk ) + { + result$topk = topk_init(topk_size(rv1$topk)); - topk_merge(result$topk, rv1$topk); - topk_merge(result$topk, rv2$topk); + topk_merge(result$topk, rv1$topk); + if ( rv2?$topk ) + topk_merge(result$topk, rv2$topk); + } + else if ( rv2?$topk ) + { + result$topk = topk_init(topk_size(rv2$topk)); + topk_merge(result$topk, rv2$topk); + } + }