diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2017-06-23 18:14:00 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-24 22:04:49 +0000 |
| commit | f7952b30c7bc09f01c70c8889575a75d0e8b7675 (patch) | |
| tree | d2871399e58d57a7051c00a1cdcce25aa42a19fe /epan | |
| parent | 1620c45e031f6d6854102f2d3b34f528bf06e194 (diff) | |
| download | wireshark-f7952b30c7bc09f01c70c8889575a75d0e8b7675.tar.gz | |
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>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/decode_as.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/decode_as.c b/epan/decode_as.c index 19e6d360b1..f7a08577ad 100644 --- a/epan/decode_as.c +++ b/epan/decode_as.c @@ -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); |