components/net-snmp/patches/051.19616471.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Thu, 30 Oct 2014 12:03:11 -0700
branchs11-update
changeset 3440 573f3b6b1987
permissions -rw-r--r--
19547764 problem in UTILITY/NET-SNMP 19616465 problem in UTILITY/NET-SNMP 19616471 problem in UTILITY/NET-SNMP
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3440
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     1
http://sourceforge.net/p/net-snmp/code/ci/76e8d6d100320629d8a23be4b0128619600c919d/
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     2
https://security-tracker.debian.org/tracker/CVE-2014-2285
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     3
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     4
diff --git a/perl/TrapReceiver/TrapReceiver.xs b/perl/TrapReceiver/TrapReceiver.xs
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     5
index d4ccac9..0ab1a81 100644
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     6
--- a/perl/TrapReceiver/TrapReceiver.xs
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     7
+++ b/perl/TrapReceiver/TrapReceiver.xs
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     8
@@ -73,18 +73,18 @@ int   perl_trapd_handler( netsnmp_pdu           *pdu,
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     9
         STOREPDUi("securitymodel", pdu->securityModel);
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    10
         STOREPDUi("securitylevel", pdu->securityLevel);
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    11
         STOREPDU("contextName",
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    12
-                 newSVpv(pdu->contextName, pdu->contextNameLen));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    13
+                 newSVpv(pdu->contextName ? pdu->contextName : "", pdu->contextNameLen));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    14
         STOREPDU("contextEngineID",
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    15
-                 newSVpv(pdu->contextEngineID,
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    16
+                 newSVpv(pdu->contextEngineID ? (char *) pdu->contextEngineID : "",
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    17
                                     pdu->contextEngineIDLen));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    18
         STOREPDU("securityEngineID",
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    19
-                 newSVpv(pdu->securityEngineID,
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    20
+                 newSVpv(pdu->securityEngineID ? (char *) pdu->securityEngineID : "",
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    21
                                     pdu->securityEngineIDLen));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    22
         STOREPDU("securityName",
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    23
-                 newSVpv(pdu->securityName, pdu->securityNameLen));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    24
+                 newSVpv(pdu->securityName ? (char *) pdu->securityName : "", pdu->securityNameLen));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    25
     } else {
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    26
         STOREPDU("community",
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    27
-                 newSVpv(pdu->community, pdu->community_len));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    28
+                 newSVpv(pdu->community ? (char *) pdu->community : "", pdu->community_len));
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    29
     }
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    30
 
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    31
     if (transport && transport->f_fmtaddr) {