diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-15 05:16:13 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-15 05:16:13 +0000 |
| commit | e3330fd9229c9b1dee36075ed260f6ded08af3b1 (patch) | |
| tree | 65a493d1fa5798cb206fb7edb6ef6cdf72973b05 /epan/dissectors/packet-frame.c | |
| parent | e31d777279d28800e520549fd8ad4c7f2d4b089e (diff) | |
instead of simply doing an assert when running out of memory in emem, throw a new OutOfMemoryError Exception, so file.c can show at least a better explanation to the user before Wireshark terminates
XXX - to prevent a busy wait, I need a portable way to wait for a short time period, like Sleep() for Windows
svn path=/trunk/; revision=20437
Diffstat (limited to 'epan/dissectors/packet-frame.c')
| -rw-r--r-- | epan/dissectors/packet-frame.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 65d50b3249..d3a695dcd8 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -313,6 +313,9 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } #endif } + CATCH(OutOfMemoryError) { + RETHROW; + } CATCH_ALL { show_exception(tvb, pinfo, parent_tree, EXCEPT_CODE, GET_MESSAGE); } |