From: Daniel Swarbrick <daniel@seventhsignal.de>
Date: Thu, 3 Mar 2011 23:17:07 +0000 (+0100)
Subject: FS-3120 - fix segv when snmpwalking ringing channels, fix segv in snmp getBulkRequest
X-Git-Tag: v1.2-rc1~181^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4c1e813ef69e93ce8f315cd82ac980e2010791;p=thirdparty%2Ffreeswitch.git

FS-3120 - fix segv when snmpwalking ringing channels, fix segv in snmp getBulkRequest
---

diff --git a/src/mod/event_handlers/mod_snmp/subagent.c b/src/mod/event_handlers/mod_snmp/subagent.c
index 92febff7d5..871fb5ad75 100644
--- a/src/mod/event_handlers/mod_snmp/subagent.c
+++ b/src/mod/event_handlers/mod_snmp/subagent.c
@@ -91,11 +91,11 @@ static int channelList_callback(void *pArg, int argc, char **argv, char **column
 	strncpy(entry->dialplan, switch_str_nil(argv[12]), sizeof(entry->dialplan));
 	strncpy(entry->context, switch_str_nil(argv[13]), sizeof(entry->context));
 	strncpy(entry->read_codec, switch_str_nil(argv[14]), sizeof(entry->read_codec));
-	entry->read_rate = atoi(argv[15]);
-	entry->read_bitrate = atoi(argv[16]);
+	entry->read_rate = atoi(switch_str_nil(argv[15]));
+	entry->read_bitrate = atoi(switch_str_nil(argv[16]));
 	strncpy(entry->write_codec, switch_str_nil(argv[17]), sizeof(entry->write_codec));
-	entry->write_rate = atoi(argv[18]);
-	entry->write_bitrate = atoi(argv[19]);
+	entry->write_rate = atoi(switch_str_nil(argv[18]));
+	entry->write_bitrate = atoi(switch_str_nil(argv[19]));
 
 	memset(&entry->ip_addr, 0, sizeof(entry->ip_addr));
 	if (strchr(switch_str_nil(argv[8]), ':')) {
@@ -282,6 +282,9 @@ int handle_channelList(netsnmp_mib_handler *handler, netsnmp_handler_registratio
 	switch (reqinfo->mode) {
 	case MODE_GET:
 		for (request = requests; request; request = request->next) {
+			if (request->processed)
+				continue;
+
 			table_info = netsnmp_extract_table_info(request);
 			entry = (chan_entry_t *) netsnmp_tdata_extract_entry(request);