← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/wireshark/gutsy-security

« back to all changes in this revision

Viewing changes to debian/patches/11_invalid_giop_r20198.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Frederic Peters
  • Date: 2007-04-01 08:58:40 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070401085840-or3qhrpv8alt1bwg
Tags: 0.99.5-1
* New upstream release.
* debian/patches/09_idl2wrs.dpatch: updated to patch idl2wrs.sh.in.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/11_invalid_giop_r20198.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 11_invalid_giop_r20198.dpatch by  <fpeters@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Check length remaining before aligning.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad wireshark-0.99.4~/epan/dissectors/packet-giop.c wireshark-0.99.4/epan/dissectors/packet-giop.c
9
 
--- wireshark-0.99.4~/epan/dissectors/packet-giop.c     2006-10-31 17:59:06.000000000 +0000
10
 
+++ wireshark-0.99.4/epan/dissectors/packet-giop.c      2007-03-01 10:33:52.000000000 +0000
11
 
@@ -3586,7 +3586,10 @@
12
 
    * GIOP octet stream start.
13
 
    */
14
 
 
15
 
-  set_new_alignment(&offset, GIOP_HEADER_SIZE, 8);
16
 
+  if (tvb_reported_length_remaining(tvb, offset) > 0)
17
 
+  {
18
 
+    set_new_alignment(&offset, GIOP_HEADER_SIZE, 8);
19
 
+  }
20
 
 
21
 
   /*
22
 
    * Save FN,reqid,and operation for later. Add sub_handle later.