mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-26 12:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug #40050 SNMP problem with MIB arrays > 255

Browse Source
This commit is contained in:
Simon Goldschmidt 2014-02-20 22:14:10 +01:00
parent a58083b11e
commit c1dc1a20d6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -96,6 +96,9 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2014-02-20: Simon Goldschmidt
* mib_structs.c: fixed bug #40050 SNMP problem with MIB arrays > 255
2014-02-20: Simon Goldschmidt 2014-02-20: Simon Goldschmidt
* api.h, sockets.c: fixed bug #41499 netconn::recv_avail can overflow * api.h, sockets.c: fixed bug #41499 netconn::recv_avail can overflow

10
src/core/snmp/mib_structs.c
View File

@ -737,13 +737,13 @@ snmp_expand_tree(struct mib_node *node, u8_t ident_len, s32_t *ident, struct snm
} }
else else
{ {
u8_t j; u16_t j;
struct nse cur_node; struct nse cur_node;
LWIP_DEBUGF(SNMP_MIB_DEBUG,("non-leaf node\n")); LWIP_DEBUGF(SNMP_MIB_DEBUG,("non-leaf node\n"));
/* non-leaf, store right child ptr and id */ /* non-leaf, store right child ptr and id */
LWIP_ASSERT("i < 0xff", i < 0xff); LWIP_ASSERT("i < 0xff", i < 0xff);
j = (u8_t)i + 1; j = i + 1;
while ((j < an->maxlength) && (empty_table(an->nptr[j]))) while ((j < an->maxlength) && (empty_table(an->nptr[j])))
{ {
j++; j++;
@ -781,7 +781,7 @@ snmp_expand_tree(struct mib_node *node, u8_t ident_len, s32_t *ident, struct snm
} }
else else
{ {
u8_t j; u16_t j;
/* ident_len == 0, complete with leftmost '.thing' */ /* ident_len == 0, complete with leftmost '.thing' */
j = 0; j = 0;
while ((j < an->maxlength) && empty_table(an->nptr[j])) while ((j < an->maxlength) && empty_table(an->nptr[j]))
@ -980,13 +980,13 @@ snmp_expand_tree(struct mib_node *node, u8_t ident_len, s32_t *ident, struct snm
} }
else else
{ {
u8_t j; u16_t j;
struct nse cur_node; struct nse cur_node;
LWIP_DEBUGF(SNMP_MIB_DEBUG,("non-leaf node\n")); LWIP_DEBUGF(SNMP_MIB_DEBUG,("non-leaf node\n"));
/* non-leaf, store right child ptr and id */ /* non-leaf, store right child ptr and id */
LWIP_ASSERT("i < 0xff", i < 0xff); LWIP_ASSERT("i < 0xff", i < 0xff);
j = (u8_t)i + 1; j = i + 1;
if (j < len) if (j < len)
{ {
/* right node is the current external node */ /* right node is the current external node */