mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-03-27 14:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #46128 (patch by Kerem Hadimli)

Browse Source
This commit is contained in:
goldsimon 2015-10-06 12:42:25 +02:00
parent 58895c3cf6
commit 0737cfb84e
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/snmp/msg_in.c
View File

@ -1415,12 +1415,22 @@ snmp_varbind_alloc(struct snmp_obj_id *oid, u8_t type, u16_t len)
vb->ident_len = i; vb->ident_len = i;
if (i > 0) if (i > 0)
{ {
LWIP_ASSERT("SNMP_MAX_TREE_DEPTH is configured too low", i <= SNMP_MAX_TREE_DEPTH); if (i <= SNMP_MAX_TREE_DEPTH)
/* allocate array of s32_t for our object identifier */ {
vb->ident = (s32_t*)memp_malloc(MEMP_SNMP_VALUE); /* allocate array of s32_t for our object identifier */
vb->ident = (s32_t*)memp_malloc(MEMP_SNMP_VALUE);
if (vb->ident == NULL)
{
LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: couldn't allocate ident value space\n"));
}
}
else
{
LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: SNMP_MAX_TREE_DEPTH is configured too low\n"));
vb->ident = NULL;
}
if (vb->ident == NULL) if (vb->ident == NULL)
{ {
LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: couldn't allocate ident value space\n"));
memp_free(MEMP_SNMP_VARBIND, vb); memp_free(MEMP_SNMP_VARBIND, vb);
return NULL; return NULL;
} }
@ -1439,12 +1449,22 @@ snmp_varbind_alloc(struct snmp_obj_id *oid, u8_t type, u16_t len)
vb->value_len = len; vb->value_len = len;
if (len > 0) if (len > 0)
{ {
LWIP_ASSERT("SNMP_MAX_OCTET_STRING_LEN is configured too low", vb->value_len <= SNMP_MAX_VALUE_SIZE); if (vb->value_len <= SNMP_MAX_VALUE_SIZE)
/* allocate raw bytes for our object value */ {
vb->value = memp_malloc(MEMP_SNMP_VALUE); /* allocate raw bytes for our object value */
vb->value = memp_malloc(MEMP_SNMP_VALUE);
if (vb->value == NULL)
{
LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: couldn't allocate value space\n"));
}
}
else
{
LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: SNMP_MAX_OCTET_STRING_LEN is configured too low\n"));
vb->value = NULL;
}
if (vb->value == NULL) if (vb->value == NULL)
{ {
LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: couldn't allocate value space\n"));
if (vb->ident != NULL) if (vb->ident != NULL)
{ {
memp_free(MEMP_SNMP_VALUE, vb->ident); memp_free(MEMP_SNMP_VALUE, vb->ident);