From: jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 22 Dec 2006 14:48:51 +0000 (+0000)
Subject: Fix for bug 1272.
X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=ee7439b3f924b45628d4e8a20b0c7c70017b96ca

Fix for bug 1272.
Check length remaining before aligning.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20198 f5534014-38df-0310-8fa8-9805f1628bb7
---

diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 597fc3ff2f..435205fa33 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -3586,7 +3586,10 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo,
    * GIOP octet stream start.
    */
 
-  set_new_alignment(&offset, GIOP_HEADER_SIZE, 8);
+  if (tvb_reported_length_remaining(tvb, offset) > 0)
+  {
+    set_new_alignment(&offset, GIOP_HEADER_SIZE, 8);
+  }
 
   /*
    * Save FN,reqid,and operation for later. Add sub_handle later.