diff options
author | Michael Mann <mmann78@netscape.net> | 2016-05-10 16:04:14 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-05-10 22:49:08 +0000 |
commit | 1dccd1ee072722fbe6d5e1a9d726a7e87d191f76 (patch) | |
tree | 4d4059e0eead7303c6d7420a3828332d26bd79fa /epan/dfilter | |
parent | 931603c4b84a5e69e94e3bfd3c84332e664062ab (diff) | |
download | wireshark-1dccd1ee072722fbe6d5e1a9d726a7e87d191f76.tar.gz |
Have fvalue_to_string_repr always return an (wmem) allocated buffer.
Previous patches converted all fvalue_to_string_repr calls to expect
an allocated buffer (and not a passed in one). Now changing signature
to force an allocated buffer. Added wmem in case that can be taken
advantage of within epan (and since the function signature was changing
anyway).
Change-Id: Ica1ac4a9a182ce0e73303856329e198d9d525b7b
Reviewed-on: https://code.wireshark.org/review/15343
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dfilter')
-rw-r--r-- | epan/dfilter/dfilter-macro.c | 4 | ||||
-rw-r--r-- | epan/dfilter/dfvm.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c index a971633dbb..74c90e0f04 100644 --- a/epan/dfilter/dfilter-macro.c +++ b/epan/dfilter/dfilter-macro.c @@ -55,7 +55,7 @@ void dump_dfilter_macro_t(const dfilter_macro_t *m, const char *function, const static gboolean free_value(gpointer k _U_, gpointer v, gpointer u _U_) { fvt_cache_entry_t* e = (fvt_cache_entry_t*)v; - g_free(e->repr); + wmem_free(NULL, e->repr); g_free(e); return TRUE; } @@ -78,7 +78,7 @@ static gboolean fvt_cache_cb(proto_node * node, gpointer data _U_) { } e = g_new(fvt_cache_entry_t,1); e->name = finfo->hfinfo->abbrev, - e->repr = fvalue_to_string_repr(&(finfo->value), FTREPR_DFILTER, finfo->hfinfo->display, NULL); + e->repr = fvalue_to_string_repr(NULL, &(finfo->value), FTREPR_DFILTER, finfo->hfinfo->display); e->usable = TRUE; g_hash_table_insert(fvt_cache,(void*)finfo->hfinfo->abbrev,e); } diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c index dd7d7bac38..c942f89bcd 100644 --- a/epan/dfilter/dfvm.c +++ b/epan/dfilter/dfvm.c @@ -109,13 +109,13 @@ dfvm_dump(FILE *f, dfilter_t *df) switch (insn->op) { case PUT_FVALUE: - value_str = fvalue_to_string_repr(arg1->value.fvalue, - FTREPR_DFILTER, BASE_NONE, NULL); + value_str = fvalue_to_string_repr(NULL, arg1->value.fvalue, + FTREPR_DFILTER, BASE_NONE); fprintf(f, "%05d PUT_FVALUE\t%s <%s> -> reg#%u\n", id, value_str, fvalue_type_name(arg1->value.fvalue), arg2->value.numeric); - g_free(value_str); + wmem_free(NULL, value_str); break; case CHECK_EXISTS: case READ_TREE: |