From a3424f8c0b9440ebf8ec3375b1723857c35fa9c9 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 28 Apr 2009 15:29:14 +0000
Subject: [PATCH] mini-snmpd: fix a segfault when passing an invalid oid to the
 -V option (closes: #5021), log messages to syslog

SVN-Revision: 15469
---
 net/mini_snmpd/Makefile                       |  2 +-
 .../103-mib_encode_snmp_element_oid_fix.patch | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 net/mini_snmpd/patches/103-mib_encode_snmp_element_oid_fix.patch

diff --git a/net/mini_snmpd/Makefile b/net/mini_snmpd/Makefile
index 0ed7dcb20..9b746782c 100644
--- a/net/mini_snmpd/Makefile
+++ b/net/mini_snmpd/Makefile
@@ -31,7 +31,7 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
-		OFLAGS="$(TARGET_CFLAGS)" \
+		OFLAGS="$(TARGET_CFLAGS) -DSYSLOG" \
 		STRIP="/bin/true" \
 		INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
 		mini_snmpd install
diff --git a/net/mini_snmpd/patches/103-mib_encode_snmp_element_oid_fix.patch b/net/mini_snmpd/patches/103-mib_encode_snmp_element_oid_fix.patch
new file mode 100644
index 000000000..a46ace24e
--- /dev/null
+++ b/net/mini_snmpd/patches/103-mib_encode_snmp_element_oid_fix.patch
@@ -0,0 +1,21 @@
+--- a/mib.c
++++ b/mib.c
+@@ -120,6 +120,9 @@ static int encode_snmp_element_oid(value
+ 	int length;
+ 	int i;
+ 
++	if (oid_value == NULL) {
++		return -1;
++	}
+ 	buffer = value->data.buffer;
+ 	length = 1;
+ 	for (i = 2; i < oid_value->subid_list_length; i++) {
+@@ -293,6 +296,8 @@ static int mib_build_entry(const oid_t *
+ 			value->data.encoded_length = 0;
+ 			value->data.buffer = malloc(value->data.max_length);
+ 			if (encode_snmp_element_oid(value, oid_aton((const char *)default_value)) == -1) {
++				lprintf(LOG_ERR, "could not create MIB entry '%s.%d.%d': invalid oid '%s'\n",
++					oid_ntoa(prefix), column, row, (char *)default_value);
+ 				return -1;
+ 			}
+ 			break;
-- 
2.30.2