Added missing NULL return checks for snmp_mib_lrn_alloc() and trimmed whitespace at line ends.

This commit is contained in:
christiaans 2006-11-17 11:07:25 +00:00
parent 5e44122552
commit b72677c3ce

View File

@ -1094,6 +1094,8 @@ void snmp_insert_arpidx_tree(struct netif *ni, struct ip_addr *ip)
{ {
at_rn = snmp_mib_lrn_alloc(); at_rn = snmp_mib_lrn_alloc();
at_node->nptr = (struct mib_node*)at_rn; at_node->nptr = (struct mib_node*)at_rn;
if (at_rn != NULL)
{
if (level == 3) if (level == 3)
{ {
if (tree == 0) if (tree == 0)
@ -1111,6 +1113,13 @@ void snmp_insert_arpidx_tree(struct netif *ni, struct ip_addr *ip)
} }
} }
else else
{
/* at_rn == NULL, malloc failure */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_arpidx_tree() insert failed, mem full"));
break;
}
}
else
{ {
at_rn = (struct mib_list_rootnode*)at_node->nptr; at_rn = (struct mib_list_rootnode*)at_node->nptr;
} }
@ -1309,6 +1318,8 @@ void snmp_insert_ipaddridx_tree(struct netif *ni)
{ {
ipa_rn = snmp_mib_lrn_alloc(); ipa_rn = snmp_mib_lrn_alloc();
ipa_node->nptr = (struct mib_node*)ipa_rn; ipa_node->nptr = (struct mib_node*)ipa_rn;
if (ipa_rn != NULL)
{
if (level == 2) if (level == 2)
{ {
ipa_rn->get_object_def = ip_addrentry_get_object_def; ipa_rn->get_object_def = ip_addrentry_get_object_def;
@ -1318,6 +1329,13 @@ void snmp_insert_ipaddridx_tree(struct netif *ni)
} }
} }
else else
{
/* ipa_rn == NULL, malloc failure */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_ipaddridx_tree() insert failed, mem full"));
break;
}
}
else
{ {
ipa_rn = (struct mib_list_rootnode*)ipa_node->nptr; ipa_rn = (struct mib_list_rootnode*)ipa_node->nptr;
} }
@ -1439,6 +1457,8 @@ void snmp_insert_iprteidx_tree(u8_t dflt, struct netif *ni)
{ {
iprte_rn = snmp_mib_lrn_alloc(); iprte_rn = snmp_mib_lrn_alloc();
iprte_node->nptr = (struct mib_node*)iprte_rn; iprte_node->nptr = (struct mib_node*)iprte_rn;
if (iprte_rn != NULL)
{
if (level == 2) if (level == 2)
{ {
iprte_rn->get_object_def = ip_rteentry_get_object_def; iprte_rn->get_object_def = ip_rteentry_get_object_def;
@ -1448,6 +1468,13 @@ void snmp_insert_iprteidx_tree(u8_t dflt, struct netif *ni)
} }
} }
else else
{
/* iprte_rn == NULL, malloc failure */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_iprteidx_tree() insert failed, mem full"));
break;
}
}
else
{ {
iprte_rn = (struct mib_list_rootnode*)iprte_node->nptr; iprte_rn = (struct mib_list_rootnode*)iprte_node->nptr;
} }
@ -1765,6 +1792,8 @@ void snmp_insert_udpidx_tree(struct udp_pcb *pcb)
{ {
udp_rn = snmp_mib_lrn_alloc(); udp_rn = snmp_mib_lrn_alloc();
udp_node->nptr = (struct mib_node*)udp_rn; udp_node->nptr = (struct mib_node*)udp_rn;
if (udp_rn != NULL)
{
if (level == 3) if (level == 3)
{ {
udp_rn->get_object_def = udpentry_get_object_def; udp_rn->get_object_def = udpentry_get_object_def;
@ -1774,6 +1803,13 @@ void snmp_insert_udpidx_tree(struct udp_pcb *pcb)
} }
} }
else else
{
/* udp_rn == NULL, malloc failure */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_udpidx_tree() insert failed, mem full"));
break;
}
}
else
{ {
udp_rn = (struct mib_list_rootnode*)udp_node->nptr; udp_rn = (struct mib_list_rootnode*)udp_node->nptr;
} }