diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-05-13 01:24:47 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-05-13 01:24:47 +0000 |
| commit | b6e941027ff5b41a55bf23ce43d23e8ea5d49efc (patch) | |
| tree | 3becaf90450ff578c7dc8dbcd051987b3ee15ba4 /packet-giop.h | |
| parent | ef67bf2d2f260b3e58cfb19ba550b517fb1196c0 (diff) | |
| download | wireshark-b6e941027ff5b41a55bf23ce43d23e8ea5d49efc.tar.gz | |
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only
it throws the appropriate exception if the bytes don't exist. Use it in
the GIOP and ASN.1 code to check whether the bytes to be copied to a
buffer exist before allocating the buffer.
Make "check_offset_length_no_exception()" check for an overflow, so that
it can be used in "tvb_ensure_bytes_exist()" and do all the checking
that the code "tvb_ensure_bytes_exist()" replaces did.
Make "get_CDR_wchar()" return a "gint", so that if the length octet it
fetched has a value between 128 and 255, the length can be returned
correctly.
Fix some comments not to specify the exception thrown by various
routines that can throw various exceptions.
svn path=/trunk/; revision=5453
Diffstat (limited to 'packet-giop.h')
| -rw-r--r-- | packet-giop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-giop.h b/packet-giop.h index 690f796176..3e43eac4dc 100644 --- a/packet-giop.h +++ b/packet-giop.h @@ -4,7 +4,7 @@ * * Based on CORBAv2.4.2 Chapter 15 GIOP Description. * - * $Id: packet-giop.h,v 1.8 2002/05/12 20:43:29 gerald Exp $ + * $Id: packet-giop.h,v 1.9 2002/05/13 01:24:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -484,7 +484,7 @@ extern guint16 get_CDR_ushort(tvbuff_t *tvb, int *offset, * Wchar is not supported for GIOP 1.0. */ -extern gint8 get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, +extern gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, MessageHeader * header); |