osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

decode_as: replace DISSECTOR_ASSERT() with g_assert() 

Don't use DISSECTOR_ASSERT() unless we're in wmem packet scope, see
commit 341b06ce0795ae957627c9174b57e75c7827f028

Change-Id: I509f9197155fe6ea6f46c23c93eb188220b9dd8d
Reviewed-on: https://code.wireshark.org/review/22379
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Martin Kaiser 2017-06-23 18:14:00 -04:00 committed by Michael Mann
parent 1620c45e03
commit f7952b30c7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/decode_as.c
View File

@ -42,9 +42,9 @@ void register_decode_as(decode_as_t* reg)
dissector_table_t decode_table;
/* Ensure valid functions */
DISSECTOR_ASSERT(reg->populate_list);
DISSECTOR_ASSERT(reg->reset_value);
DISSECTOR_ASSERT(reg->change_value);
g_assert(reg->populate_list);
g_assert(reg->reset_value);
g_assert(reg->change_value);
decode_table = find_dissector_table(reg->table_name);
if (decode_table != NULL)
@ -76,7 +76,7 @@ void register_decode_as_next_proto(
dissector_table_t dt;
dt = find_dissector_table(table_name);
DISSECTOR_ASSERT(IS_FT_UINT(dissector_table_get_type(dt)));
g_assert(IS_FT_UINT(dissector_table_get_type(dt)));
da = wmem_new0(wmem_epan_scope(), decode_as_t);
da->name = wmem_strdup(wmem_epan_scope(), name);