Fix crash when seeing 256 '['

ikatyang · Sep 6, 2021 · ff9f814 · ff9f814
1 parent 8b8b77a
commit ff9f814
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/tree_sitter_markdown/block_context.cc b/src/tree_sitter_markdown/block_context.cc
@@ -72,6 +72,7 @@ unsigned BlockContextStack::deserialize(const unsigned char *buffer) {
 }
 
 void BlockContextStack::push(const BlockContext &ctx) {
+  TREE_SITTER_MARKDOWN_ASSERT(stk_.size() < 255);
   stk_.push_back(ctx);
 }
 void BlockContextStack::pop() {

diff --git a/src/tree_sitter_markdown/block_delimiter.cc b/src/tree_sitter_markdown/block_delimiter.cc
@@ -140,7 +140,7 @@ void BlockDelimiterList::drop_pos() {
 unsigned BlockDelimiterList::serialize(unsigned char *buffer) const {
   size_t i = 0;
   size_t size_i = i++;
-  size_t size = 0;
+  unsigned char size = 0;
   for (ConstIterator itr = list_.begin(), end = list_.end(); itr != end; itr++) {
     i += itr->serialize(&buffer[i]);
     size++;
@@ -160,6 +160,7 @@ unsigned BlockDelimiterList::deserialize(const unsigned char *buffer) {
 void BlockDelimiterList::pop_front() { list_.pop_front(); }
 void BlockDelimiterList::push_back(const BlockDelimiter &dlm) { list_.push_back(dlm); }
 BlockDelimiterList::Iterator BlockDelimiterList::insert(const BlockDelimiterList::Iterator itr, const BlockDelimiter &dlm) {
+  TREE_SITTER_MARKDOWN_ASSERT(list_.size() < 255);
   return list_.insert(itr, dlm);
 }
 BlockDelimiterList::Iterator BlockDelimiterList::insert(const LexedRow row, const BlockDelimiter &dlm) {

diff --git a/src/tree_sitter_markdown/inline_delimiter.cc b/src/tree_sitter_markdown/inline_delimiter.cc
@@ -170,13 +170,16 @@ bool MinimizedInlineDelimiterList::empty() const { return list_.empty(); }
 MinimizedInlineDelimiter &MinimizedInlineDelimiterList::front() { return list_.front(); }
 
 void MinimizedInlineDelimiterList::pop_front() { list_.pop_front(); }
-void MinimizedInlineDelimiterList::push_back(const MinimizedInlineDelimiter &delimiter) { list_.push_back(delimiter); }
+void MinimizedInlineDelimiterList::push_back(const MinimizedInlineDelimiter &delimiter) {
+    TREE_SITTER_MARKDOWN_ASSERT(list_.size() < 255);
+    list_.push_back(delimiter);
+}
 
 void MinimizedInlineDelimiterList::clear() { list_.clear(); }
 unsigned MinimizedInlineDelimiterList::serialize(unsigned char *buffer) const {
   size_t i = 0;
   size_t size_i = i++;
-  size_t size = 0;
+  unsigned char size = 0;
   for (ConstIterator itr = list_.begin(), end = list_.end(); itr != end; itr++) {
     i += itr->serialize(&buffer[i]);
     size++;