summaryrefslogtreecommitdiff
path: root/epan/dfilter/dfilter-macro.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-02-17 08:39:41 +0000
committerGuy Harris <guy@alum.mit.edu>2011-02-17 08:39:41 +0000
commit71b71d920e11b6698feaae3a4d7318b93c296547 (patch)
tree6d3ed759f6f963aa82b66b5822c3f7525c37c215 /epan/dfilter/dfilter-macro.c
parent8eb8623b15bd5870ffb86d76b9f396d4ccf0537f (diff)
downloadwireshark-71b71d920e11b6698feaae3a4d7318b93c296547.tar.gz
Oops, wrong pointer comparison.
svn path=/trunk/; revision=35976
Diffstat (limited to 'epan/dfilter/dfilter-macro.c')
-rw-r--r--epan/dfilter/dfilter-macro.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 7bc3a87d21..1012e13d29 100644
--- a/epan/dfilter/dfilter-macro.c
+++ b/epan/dfilter/dfilter-macro.c
@@ -170,8 +170,9 @@ static gchar* dfilter_macro_resolve(gchar* name, gchar** args, const gchar** err
}
if (!m) {
- if (fvt_cache && (e = g_hash_table_lookup(fvt_cache,name) )) {
- if(e->usable != NULL) {
+ if (fvt_cache &&
+ (e = g_hash_table_lookup(fvt_cache,name)) != NULL) {
+ if(e->usable) {
return e->repr;
} else {
*error = ep_strdup_printf("macro '%s' is unusable", name);