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

Slightly improve error message in case of initialization errors. 

Change-Id: Icb5d4f0f3bc60970737abbf62044f4550e8d3ca3
Reviewed-on: https://code.wireshark.org/review/16059
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2016-06-21 19:56:00 +02:00 committed by Jörg Mayer
parent c3f3bd7fa8
commit d970da4025
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/packet.c
View File

@ -931,8 +931,15 @@ dissector_add_uint(const char *name, const guint32 pattern, dissector_handle_t h
sub_dissectors = find_dissector_table(name);
/*
* Make sure the dissector table exists.
* Make sure the handle and the dissector table exist.
*/
if (handle == NULL) {
fprintf(stderr, "OOPS: handle to register \"%s\" to doesn't exist\n",
name);
if (getenv("WIRESHARK_ABORT_ON_DISSECTOR_BUG") != NULL)
abort();
return;
}
if (sub_dissectors == NULL) {
fprintf(stderr, "OOPS: dissector table \"%s\" doesn't exist\n",
name);
@ -943,8 +950,6 @@ dissector_add_uint(const char *name, const guint32 pattern, dissector_handle_t h
return;
}
/* sanity checks */
g_assert(handle!=NULL);
switch (sub_dissectors->type) {
case FT_UINT8: