traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent crash due to huge number of possible paths through parse stack

Browse source
This commit is contained in:
Max Brunsfeld 2017-02-20 14:34:10 -08:00
parent ce5b3e8284
commit df520635c6
5 changed files with 72 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/runtime/stack.c
View file

@ -8,6 +8,7 @@
#define MAX_LINK_COUNT 8
#define MAX_NODE_POOL_SIZE 50
#define MAX_ITERATOR_COUNT 64
#define INLINE static inline __attribute__((always_inline))
@ -143,7 +144,9 @@ static StackNode *stack_node_new(StackNode *next, Tree *tree, bool is_pending,
static void stack_node_add_link(StackNode *self, StackLink link) {
for (int i = 0; i < self->link_count; i++) {
StackLink existing_link = self->links[i];
if (existing_link.tree == link.tree) {
if (existing_link.tree == link.tree ||
(existing_link.tree && link.tree &&
ts_tree_tokens_eq(existing_link.tree, link.tree))) {
if (existing_link.node == link.node)
return;
if (existing_link.node->state == link.node->state) {
@ -253,6 +256,7 @@ INLINE StackPopResult stack__iter(Stack *self, StackVersion version,
link = node->links[0];
next_iterator = &self->iterators.contents[i];
} else {
if (self->iterators.size >= MAX_ITERATOR_COUNT) continue;
link = node->links[j];
array_push(&self->iterators, self->iterators.contents[i]);
next_iterator = array_back(&self->iterators);