diff options
| author | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-22 14:48:51 +0000 |
|---|---|---|
| committer | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-22 14:48:51 +0000 |
| commit | ee7439b3f924b45628d4e8a20b0c7c70017b96ca (patch) | |
| tree | 769c7074c1bacbaef6b2f87b0c2a1b1022d84037 /epan/dissectors/packet-giop.c | |
| parent | fe2edf8b19420fcbd6fb5a324e959ad4d92786aa (diff) | |
Fix for bug 1272.
Check length remaining before aligning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20198 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-giop.c')
| -rw-r--r-- | epan/dissectors/packet-giop.c | 5 |
1 files changed, 4 insertions, 1 deletions
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. |