|
 |
34d7f3 |
1100099 - net-snmp-python adds zeros to end of IP address (IPADDR type), which is not valid
|
|
|
34d7f3 |
|
|
|
34d7f3 |
commit 1bc799de6cab010b25c0c4d3f5155b5fbaf527f0
|
|
|
34d7f3 |
Author: Bart Van Assche <bvanassche@acm.org>
|
|
|
34d7f3 |
Date: Thu Feb 21 20:05:14 2013 +0100
|
|
|
34d7f3 |
|
|
|
34d7f3 |
Python bindings: Fix the out-of-bounds write
|
|
|
34d7f3 |
|
|
|
34d7f3 |
See also commit 234158b8e84cc204cbac96e6e9be6959635404b8
|
|
|
34d7f3 |
|
|
|
34d7f3 |
diff --git a/python/netsnmp/client_intf.c b/python/netsnmp/client_intf.c
|
|
|
34d7f3 |
index 3eda804..d188e65 100644
|
|
|
34d7f3 |
--- a/python/netsnmp/client_intf.c
|
|
|
34d7f3 |
+++ b/python/netsnmp/client_intf.c
|
|
|
34d7f3 |
@@ -822,14 +822,18 @@ OCT:
|
|
|
34d7f3 |
|
|
|
34d7f3 |
case TYPE_IPADDR:
|
|
|
34d7f3 |
vars->type = ASN_IPADDRESS;
|
|
|
34d7f3 |
- vars->val.integer = (in_addr_t *)malloc(sizeof(in_addr_t));
|
|
|
34d7f3 |
- if (val)
|
|
|
34d7f3 |
- *(vars->val.integer) = inet_addr(val);
|
|
|
34d7f3 |
- else {
|
|
|
34d7f3 |
- ret = FAILURE;
|
|
|
34d7f3 |
- *(vars->val.integer) = 0;
|
|
|
34d7f3 |
+ {
|
|
|
34d7f3 |
+ in_addr_t addr;
|
|
|
34d7f3 |
+
|
|
|
34d7f3 |
+ if (val)
|
|
|
34d7f3 |
+ addr = inet_addr(val);
|
|
|
34d7f3 |
+ else {
|
|
|
34d7f3 |
+ ret = FAILURE;
|
|
|
34d7f3 |
+ addr = 0;
|
|
|
34d7f3 |
+ }
|
|
|
34d7f3 |
+ memdup(&vars->val.integer, &addr, sizeof(addr));
|
|
|
34d7f3 |
+ vars->val_len = sizeof(addr);
|
|
|
34d7f3 |
}
|
|
|
34d7f3 |
- vars->val_len = sizeof(in_addr_t);
|
|
|
34d7f3 |
break;
|
|
|
34d7f3 |
|
|
|
34d7f3 |
case TYPE_OBJID:
|
|
|
34d7f3 |
commit d9789f2570452b54112443f3b8a32cf22a4ec783
|
|
|
34d7f3 |
Author: Jan Safranek <jsafranek@users.sourceforge.net>
|
|
|
34d7f3 |
Date: Fri Feb 27 13:55:07 2015 +0100
|
|
|
34d7f3 |
|
|
|
34d7f3 |
Fixed compiler warning.
|
|
|
34d7f3 |
|
|
|
34d7f3 |
diff --git a/python/netsnmp/client_intf.c b/python/netsnmp/client_intf.c
|
|
|
34d7f3 |
index 7fc74dc..db5db75 100644
|
|
|
34d7f3 |
--- a/python/netsnmp/client_intf.c
|
|
|
34d7f3 |
+++ b/python/netsnmp/client_intf.c
|
|
|
34d7f3 |
@@ -833,7 +833,7 @@ OCT:
|
|
|
34d7f3 |
ret = FAILURE;
|
|
|
34d7f3 |
addr = 0;
|
|
|
34d7f3 |
}
|
|
|
34d7f3 |
- memdup(&vars->val.integer, &addr, sizeof(addr));
|
|
|
34d7f3 |
+ memdup((u_char**) &vars->val.integer, &addr, sizeof(addr));
|
|
|
34d7f3 |
vars->val_len = sizeof(addr);
|
|
|
34d7f3 |
}
|
|
|
34d7f3 |
break;
|