| author | Tomas Klacko <tomas.klacko@oracle.com> |
| Thu, 18 Sep 2014 09:47:48 -0700 | |
| changeset 2096 | ea57cc1059bf |
| permissions | -rw-r--r-- |
|
2096
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
1 |
http://sourceforge.net/p/net-snmp/code/ci/76e8d6d100320629d8a23be4b0128619600c919d/ |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
2 |
https://security-tracker.debian.org/tracker/CVE-2014-2285 |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
3 |
|
|
ea57cc1059bf
19616471 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 |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
5 |
index d4ccac9..0ab1a81 100644 |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
6 |
--- a/perl/TrapReceiver/TrapReceiver.xs |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
7 |
+++ b/perl/TrapReceiver/TrapReceiver.xs |
|
ea57cc1059bf
19616471 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, |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
9 |
STOREPDUi("securitymodel", pdu->securityModel);
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
10 |
STOREPDUi("securitylevel", pdu->securityLevel);
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
11 |
STOREPDU("contextName",
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
12 |
- newSVpv(pdu->contextName, pdu->contextNameLen)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
13 |
+ newSVpv(pdu->contextName ? pdu->contextName : "", pdu->contextNameLen)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
14 |
STOREPDU("contextEngineID",
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
15 |
- newSVpv(pdu->contextEngineID, |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
16 |
+ newSVpv(pdu->contextEngineID ? (char *) pdu->contextEngineID : "", |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
17 |
pdu->contextEngineIDLen)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
18 |
STOREPDU("securityEngineID",
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
19 |
- newSVpv(pdu->securityEngineID, |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
20 |
+ newSVpv(pdu->securityEngineID ? (char *) pdu->securityEngineID : "", |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
21 |
pdu->securityEngineIDLen)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
22 |
STOREPDU("securityName",
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
23 |
- newSVpv(pdu->securityName, pdu->securityNameLen)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
24 |
+ newSVpv(pdu->securityName ? (char *) pdu->securityName : "", pdu->securityNameLen)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
25 |
} else {
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
26 |
STOREPDU("community",
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
27 |
- newSVpv(pdu->community, pdu->community_len)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
28 |
+ newSVpv(pdu->community ? (char *) pdu->community : "", pdu->community_len)); |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
29 |
} |
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
30 |
|
|
ea57cc1059bf
19616471 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
31 |
if (transport && transport->f_fmtaddr) {
|