← Back to branch summary

~ubuntu-branches/debian/squeeze/wireshark/squeeze

« back to all changes in this revision

Viewing changes to debian/patches/25_fix-libsmi-workaround.patch

  • Committer: Bazaar Package Importer
  • Author(s): Balint Reczey
  • Date: 2010-10-15 22:46:22 UTC
  • mfrom: (43.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20101015224622-tn6a5ux4c9a02q60
Tags: 1.2.11-3
* security fixes from Wireshark 1.2.12:
  - The Penetration Test Team of NCNIPC (China) discovered that the
    ASN.1 BER dissector was susceptible to a stack overflow
    (CVE-2010-3445)
  - fix crash in RPC dissector

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/25_fix-libsmi-workaround.patch
 
1
Description: Fix the libsmi workaround by adding missing brackets.
 
2
 
 
3
Forwarded: http://anonsvn.wireshark.org/viewvc?view=rev&revision=34280
 
4
Author: Grzegorz Głowacki <g.glowacki@wasko.pl>
 
5
 
 
6
Index: epan/oids.c
 
7
===================================================================
 
8
--- a/epan/oids.c       (revision 34279)
 
9
+++ b/epan/oids.c       (revision 34280)
 
10
@@ -623,7 +623,7 @@
 
11
                 * workaround for libsmi versions where this problem is fixed.
 
12
                 * Currently there is no such version. :-(
 
13
                 */
 
14
-               if (smiModule->conformance == 1)
 
15
+               if (smiModule->conformance == 1) {
 
16
                        if (!prefs.suppress_smi_errors) {
 
17
                                report_failure("Stopped processing module %s due to "
 
18
                                        "error(s) to prevent potential crash in libsmi.\n"
 
19
@@ -632,7 +632,7 @@
 
20
                                         smiModule->name, smiModule->conformance);
 
21
                        }
 
22
                        continue;
 
23
-
 
24
+               }
 
25
                for (smiNode = smiGetFirstNode(smiModule, SMI_NODEKIND_ANY);
 
26
                         smiNode;
 
27
                         smiNode = smiGetNextNode(smiNode, SMI_NODEKIND_ANY)) {