Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tree/Trie: Check the end of buffer

Browse source 
We set buffer->pos to buffer->end in function buffer_print() when
bvsnprintf() failed, so there would be uninitialized memory between
the old buffer->pos and the current buffer->pos.
This commit is contained in:
Pavel Tvrdik 2016-10-01 12:50:29 +02:00 committed by Ondrej Zajicek (work)
parent 7935b9d212
commit c2564d34af
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
filter/tree.c
View file

@ -165,6 +165,9 @@ tree_format(struct f_tree *t, buffer *buf)
tree_node_format(t, buf); tree_node_format(t, buf);
if (buf->pos == buf->end)
return;
/* Undo last separator */ /* Undo last separator */
if (buf->pos[-1] != '[') if (buf->pos[-1] != '[')
buf->pos -= 2; buf->pos -= 2;

3
filter/trie.c
View file

@ -300,6 +300,9 @@ trie_format(struct f_trie *t, buffer *buf)
buffer_print(buf, "%I/%d, ", IPA_NONE, 0); buffer_print(buf, "%I/%d, ", IPA_NONE, 0);
trie_node_format(t->root, buf); trie_node_format(t->root, buf);
if (buf->pos == buf->end)
return;
/* Undo last separator */ /* Undo last separator */
if (buf->pos[-1] != '[') if (buf->pos[-1] != '[')
buf->pos -= 2; buf->pos -= 2;