abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-09 07:54:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
christiaans 2006-11-17 11:07:25 +00:00
parent 5e44122552
commit b72677c3ce
1 changed files with 124 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/core/snmp/mib2.c
View File

@ -1094,20 +1094,29 @@ 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 (level == 3) if (at_rn != NULL)
{ {
if (tree == 0) if (level == 3)
{ {
at_rn->get_object_def = atentry_get_object_def; if (tree == 0)
at_rn->get_value = atentry_get_value; {
at_rn->get_object_def = atentry_get_object_def;
at_rn->get_value = atentry_get_value;
}
else
{
at_rn->get_object_def = ip_ntomentry_get_object_def;
at_rn->get_value = ip_ntomentry_get_value;
}
at_rn->set_test = noleafs_set_test;
at_rn->set_value = noleafs_set_value;
} }
else }
{ else
at_rn->get_object_def = ip_ntomentry_get_object_def; {
at_rn->get_value = ip_ntomentry_get_value; /* at_rn == NULL, malloc failure */
} LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_arpidx_tree() insert failed, mem full"));
at_rn->set_test = noleafs_set_test; break;
at_rn->set_value = noleafs_set_value;
} }
} }
else else
@ -1309,12 +1318,21 @@ 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 (level == 2) if (ipa_rn != NULL)
{ {
ipa_rn->get_object_def = ip_addrentry_get_object_def; if (level == 2)
ipa_rn->get_value = ip_addrentry_get_value; {
ipa_rn->set_test = noleafs_set_test; ipa_rn->get_object_def = ip_addrentry_get_object_def;
ipa_rn->set_value = noleafs_set_value; ipa_rn->get_value = ip_addrentry_get_value;
ipa_rn->set_test = noleafs_set_test;
ipa_rn->set_value = noleafs_set_value;
}
}
else
{
/* ipa_rn == NULL, malloc failure */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_ipaddridx_tree() insert failed, mem full"));
break;
} }
} }
else else
@ -1439,12 +1457,21 @@ 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 (level == 2) if (iprte_rn != NULL)
{ {
iprte_rn->get_object_def = ip_rteentry_get_object_def; if (level == 2)
iprte_rn->get_value = ip_rteentry_get_value; {
iprte_rn->set_test = noleafs_set_test; iprte_rn->get_object_def = ip_rteentry_get_object_def;
iprte_rn->set_value = noleafs_set_value; iprte_rn->get_value = ip_rteentry_get_value;
iprte_rn->set_test = noleafs_set_test;
iprte_rn->set_value = noleafs_set_value;
}
}
else
{
/* iprte_rn == NULL, malloc failure */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_iprteidx_tree() insert failed, mem full"));
break;
} }
} }
else else
@ -1765,12 +1792,21 @@ 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 (level == 3) if (udp_rn != NULL)
{ {
udp_rn->get_object_def = udpentry_get_object_def; if (level == 3)
udp_rn->get_value = udpentry_get_value; {
udp_rn->set_test = noleafs_set_test; udp_rn->get_object_def = udpentry_get_object_def;
udp_rn->set_value = noleafs_set_value; udp_rn->get_value = udpentry_get_value;
udp_rn->set_test = noleafs_set_test;
udp_rn->set_value = noleafs_set_value;
}
}
else
{
/* udp_rn == NULL, malloc failure */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_udpidx_tree() insert failed, mem full"));
break;
} }
} }
else else