osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Arguably, some sort of assert belongs there. 

Passing a null pointer probably means there's really something else
wrong at a higher level.  If we could arrange that the DISSECTOR_ASSERT
macros do something useful when *not* executed during a dissection, that
would work.

Change-Id: I2605d1e1f97d35370736852aaf29eeaf2c560279
Reviewed-on: https://code.wireshark.org/review/10592
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-09-20 12:09:38 -07:00
parent 1d6710f1dd
commit 741ee8cce5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/packet.c
View File

@ -1484,6 +1484,7 @@ dissector_get_string_handle(dissector_table_t sub_dissectors,
{
dtbl_entry_t *dtbl_entry;
/* XXX ASSERT instead ? */
if (!string) return NULL;
dtbl_entry = find_string_dtbl_entry(sub_dissectors, string);
if (dtbl_entry != NULL)
@ -1497,6 +1498,7 @@ dissector_get_default_string_handle(const char *name, const gchar *string)
{
dissector_table_t sub_dissectors;
/* XXX ASSERT instead ? */
if (!string) return NULL;
sub_dissectors = find_dissector_table(name);
if (sub_dissectors != NULL) {