aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-11-28 22:13:50 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-11-28 22:13:50 +0000
commit245afe5c3a654a07b2701da062cfd3fdea4c327d (patch)
tree9f494fd74c89bf78d4c7d92b0dfbb4c2cd98240c /epan/dfilter
parent40b75f9b074ad91d6c32023a94250b9a6186b4bb (diff)
Fropm Anders: Broman: Fix for bug #2041
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23655 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dfilter')
-rw-r--r--epan/dfilter/dfvm.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c
index 4e1a4dad44..17d627e906 100644
--- a/epan/dfilter/dfvm.c
+++ b/epan/dfilter/dfvm.c
@@ -342,8 +342,10 @@ free_register_overhead(dfilter_t* df)
int i;
for (i = 0; i < df->num_registers; i++) {
+ df->attempted_load[i] = FALSE;
if (df->registers[i]) {
g_list_free(df->registers[i]);
+ df->registers[i] = NULL;
}
}
}
@@ -380,7 +382,7 @@ mk_range(dfilter_t *df, int from_reg, int to_reg, drange *drange)
gboolean
dfvm_apply(dfilter_t *df, proto_tree *tree)
{
- int i, id, length;
+ int id, length;
gboolean accum = TRUE;
dfvm_insn_t *insn;
dfvm_value_t *arg1;
@@ -393,13 +395,6 @@ dfvm_apply(dfilter_t *df, proto_tree *tree)
g_assert(tree);
-
- /* Clear registers */
- for (i = 0; i < df->num_registers; i++) {
- df->registers[i] = NULL;
- df->attempted_load[i] = FALSE;
- }
-
length = df->insns->len;
for (id = 0; id < length; id++) {