diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-06-10 18:28:22 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-06-10 18:28:22 +0000 |
| commit | bdcce227e42ad0bfbef2f7ed1a5503db812b9dc0 (patch) | |
| tree | e65858f3d7c94418724c01ed7fcaf69e7272738f /epan/dissectors/packet-x11.c | |
| parent | 577d2336bf389b6b2bdd6dee5a357ef3d5c66dcb (diff) | |
just to get things straight: a dissector should *never* do any g_assert() calls!
in a simple approach, I've replaced all g_assert() and g_assert_not_reached() calls by their exception throwing counterparts DISSECTOR_ASSERT() and DISSECTOR_ASSERT_NOT_REACHED()
this will replace application crash by showing a dissector bug, which is the desired behaviour
there were some g_assert calls in the protocol registering functions, which might not be acting as expected now, but to be able to simply search for g_assert in the future I've replaced that calls too
one g_assert remained, the one when someone throws an unknown exception "into" packet_frame.c, but IMHO this one should remain.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14608 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-x11.c')
| -rw-r--r-- | epan/dissectors/packet-x11.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index f6d877e3c9..4434dc4896 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -1826,8 +1826,8 @@ static void listOfKeysyms(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, proto_tree *ttt; int i, keycode; - g_assert(keycode_first >= 0); - g_assert(keycode_count >= 0); + DISSECTOR_ASSERT(keycode_first >= 0); + DISSECTOR_ASSERT(keycode_count >= 0); for (keycode = keycode_first; keycode_count > 0; ++keycode, --keycode_count) { |