diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2005-02-24 04:11:31 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2005-02-24 04:11:31 +0000 |
| commit | 96c41e12935b8756a7ffc38bc2ef375ff86080ac (patch) | |
| tree | 2de51a76d8c1a6ba23ca0c48fe753dc3f04f57b3 /plugins/mate | |
| parent | f92477f793a1d3a9aa41b95fcf3bb8d8c1da3638 (diff) | |
| download | wireshark-96c41e12935b8756a7ffc38bc2ef375ff86080ac.tar.gz wireshark-96c41e12935b8756a7ffc38bc2ef375ff86080ac.tar.bz2 wireshark-96c41e12935b8756a7ffc38bc2ef375ff86080ac.zip | |
- fix a crash in new_avpl_strict_match when the operator avpl was empty
- change the name of the preference mate.config_filename: into mate.config:
svn path=/trunk/; revision=13488
Diffstat (limited to 'plugins/mate')
| -rw-r--r-- | plugins/mate/mate_util.c | 3 | ||||
| -rw-r--r-- | plugins/mate/packet-mate.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c index 37768d778f..6001732535 100644 --- a/plugins/mate/mate_util.c +++ b/plugins/mate/mate_util.c @@ -1217,6 +1217,9 @@ extern AVPL* new_avpl_exact_match(guint8* name,AVPL* src, AVPL* op, gboolean cop dbg_print(dbg_avpl_op,3,dbg_fp,"new_avpl_every_match: %X src=%X op=%X name='%s'",newavpl,src,op,name); #endif + if (op->len == 0) + return newavpl; + cs = src->null.next; co = op->null.next; while(1) { diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c index 15afb06012..d13524b117 100644 --- a/plugins/mate/packet-mate.c +++ b/plugins/mate/packet-mate.c @@ -336,7 +336,7 @@ proto_register_mate(void) proto_mate = proto_register_protocol("Meta Analysis Tracing Engine", "MATE", "mate"); register_dissector("mate",mate_tree,proto_mate); mate_module = prefs_register_protocol(proto_mate, proto_reg_handoff_mate); - prefs_register_string_preference(mate_module, "config_filename", + prefs_register_string_preference(mate_module, "config", "Configuration Filename", "The name of the file containing the mate module's configuration", &pref_mate_config_filename); |