commonmarker 0.14.13 → 0.14.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3831ae7665e14681344f9cefb50e6e79200087a6
-  data.tar.gz: 937ba73e3f900097378ebcad059368fb8f27071f
+  metadata.gz: a6d4aa63cc2e20379e7fc57e8fafd87fc0d3d004
+  data.tar.gz: 7bb2af43330702e69f2aede9b9f6442d88e61e85
 SHA512:
-  metadata.gz: a06a81a340b669d47db95c45455cdc0f65d7a216e8efdd2d455232f41facb3c8d30a72f651215947234550005ee3ea3dcd7a3b726e39ee24f35cf1b9e892e3c2
-  data.tar.gz: 935bc17d51a5223eba52beac774af9346fef6e7b1ede3a58cf7734992fc9e173eb3b1f5d8e50fff914f874ec6c4f537d83018a1ff5747367f9da4c01831edbc2
+  metadata.gz: 47615b3ee50b0213f9113a8d305e1697d1d7551551e43796077099146952156e3fdb837da704b69e1a8ed0aee6ba7a16933ad68556a7659b2e06f1a064513632
+  data.tar.gz: f7b3761ee08eecbe5d365bf07340a560b8117b398028d2fa7a414bace3792f86bb6c13c44a757a2973ac5e08b12a28ffb4ccada7c5c75b38a0857d4c0a0196db

data/ext/commonmarker/cmark/extensions/table.c

@@ -1,3 +1,4 @@
+#include <cmark_extension_api.h>
 #include <html.h>
 #include <inlines.h>
 #include <parser.h>
@@ -253,15 +254,19 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
   uint16_t i;
 
   if (!matched)
-    goto done;
+    return parent_container;
 
   parent_string = cmark_node_get_string_content(parent_container);
 
+  cmark_arena_push();
+
   header_row = row_from_string(self, parser, (unsigned char *)parent_string,
                                (int)strlen(parent_string));
 
   if (!header_row) {
-    goto done;
+    free_table_row(parser->mem, header_row);
+    cmark_arena_pop();
+    return parent_container;
   }
 
   marker_row = row_from_string(self, parser,
@@ -271,11 +276,24 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
   assert(marker_row);
 
   if (header_row->n_columns != marker_row->n_columns) {
-    goto done;
+    free_table_row(parser->mem, header_row);
+    free_table_row(parser->mem, marker_row);
+    cmark_arena_pop();
+    return parent_container;
+  }
+
+  if (cmark_arena_pop()) {
+    header_row = row_from_string(self, parser, (unsigned char *)parent_string,
+                                 (int)strlen(parent_string));
+    marker_row = row_from_string(self, parser,
+                                 input + cmark_parser_get_first_nonspace(parser),
+                                 len - cmark_parser_get_first_nonspace(parser));
   }
 
   if (!cmark_node_set_type(parent_container, CMARK_NODE_TABLE)) {
-    goto done;
+    free_table_row(parser->mem, header_row);
+    free_table_row(parser->mem, marker_row);
+    return parent_container;
   }
 
   cmark_node_set_syntax_extension(parent_container, self);
@@ -325,7 +343,7 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
   cmark_parser_advance_offset(
       parser, (char *)input,
       (int)strlen((char *)input) - 1 - cmark_parser_get_offset(parser), false);
-done:
+
   free_table_row(parser->mem, header_row);
   free_table_row(parser->mem, marker_row);
   return parent_container;
@@ -379,12 +397,14 @@ static int matches(cmark_syntax_extension *self, cmark_parser *parser,
   int res = 0;
 
   if (cmark_node_get_type(parent_container) == CMARK_NODE_TABLE) {
+    cmark_arena_push();
     table_row *new_row = row_from_string(
         self, parser, input + cmark_parser_get_first_nonspace(parser),
         len - cmark_parser_get_first_nonspace(parser));
     if (new_row && new_row->n_columns)
       res = 1;
     free_table_row(parser->mem, new_row);
+    cmark_arena_pop();
   }
 
   return res;

data/ext/commonmarker/cmark/src/arena.c

@@ -2,9 +2,11 @@
 #include <string.h>
 #include <stdint.h>
 #include "cmark.h"
+#include "cmark_extension_api.h"
 
 static struct arena_chunk {
   size_t sz, used;
+  uint8_t push_point;
   void *ptr;
   struct arena_chunk *prev;
 } *A = NULL;
@@ -21,6 +23,27 @@ static struct arena_chunk *alloc_arena_chunk(size_t sz, struct arena_chunk *prev
   return c;
 }
 
+void cmark_arena_push(void) {
+  if (!A)
+    return;
+  A->push_point = 1;
+  A = alloc_arena_chunk(10240, A);
+}
+
+int cmark_arena_pop(void) {
+  if (!A)
+    return 0;
+  while (A && !A->push_point) {
+    free(A->ptr);
+    struct arena_chunk *n = A->prev;
+    free(A);
+    A = n;
+  }
+  if (A)
+    A->push_point = 0;
+  return 1;
+}
+
 static void init_arena(void) {
   A = alloc_arena_chunk(4 * 1048576, NULL);
 }

data/ext/commonmarker/cmark/src/cmark_extension_api.h

@@ -686,6 +686,12 @@ void cmark_manage_extensions_special_characters(cmark_parser *parser, bool add);
 CMARK_EXPORT
 cmark_llist *cmark_parser_get_syntax_extensions(cmark_parser *parser);
 
+CMARK_EXPORT
+void cmark_arena_push(void);
+
+CMARK_EXPORT
+int cmark_arena_pop(void);
+
 #ifdef __cplusplus
 }
 #endif

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.14.13'.freeze
+  VERSION = '0.14.14'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.14.13
+  version: 0.14.14
 platform: ruby
 authors:
 - Garen Torikian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum