Added cmark_node.parent_footnote_def, removed usage of 'user_data', made sure to free allocated string in commonmark.c

Author: phillmv

src/blocks.c

@@ -484,17 +484,15 @@ static void process_footnotes(cmark_parser *parser) {
         if (!footnote->ix)
           footnote->ix = ++ix;
 
+        // store a reference to this footnote reference's footnote definition
+        // this is used by renderers when generating label ids
+        cur->parent_footnote_def = footnote->node;
+
         // keep track of a) count of how many times this footnote def has been
         // referenced, and b) which reference index this footnote ref is at.
         // this is used by renderers when generating links and backreferences.
         cur->footnote.ref_ix = ++footnote->node->footnote.def_count;
 
-        // store the footnote reference text label in the footnote ref's node's
-        // `user_data`, so that renderers can use the label when generating
-        // links and backreferences.
-        cur->user_data = parser->mem->calloc(1, (sizeof(char) * cur->as.literal.len) + 1);
-        memmove(cur->user_data, cur->as.literal.data, cur->as.literal.len);
-
         char n[32];
         snprintf(n, sizeof(n), "%d", footnote->ix);
         cmark_chunk_free(parser->mem, &cur->as.literal);

src/commonmark.c

@@ -477,7 +477,13 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node,
   case CMARK_NODE_FOOTNOTE_REFERENCE:
     if (entering) {
       LIT("[^");
-      OUT(node->user_data, false, LITERAL);
+
+      char *footnote_label = renderer->mem->calloc(1, (sizeof(char) * node->parent_footnote_def->as.literal.len) + 1);
+      memmove(footnote_label, node->parent_footnote_def->as.literal.data, node->parent_footnote_def->as.literal.len);
+
+      OUT(footnote_label, false, LITERAL);
+      renderer->mem->free(footnote_label);
+
       LIT("]");
     }
     break;
@@ -487,10 +493,12 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node,
       renderer->footnote_ix += 1;
       LIT("[^");
 
-      char *str = renderer->mem->calloc(1, (sizeof(char) * node->as.literal.len) + 1);
-      memmove(str, node->as.literal.data, node->as.literal.len);
+      char *footnote_label = renderer->mem->calloc(1, (sizeof(char) * node->as.literal.len) + 1);
+      memmove(footnote_label, node->as.literal.data, node->as.literal.len);
+
+      OUT(footnote_label, false, LITERAL);
+      renderer->mem->free(footnote_label);
 
-      OUT(str, false, LITERAL);
       LIT("]:\n");
 
       cmark_strbuf_puts(renderer->prefix, "    ");

src/html.c

@@ -424,9 +424,9 @@ static int S_render_node(cmark_html_renderer *renderer, cmark_node *node,
   case CMARK_NODE_FOOTNOTE_REFERENCE:
     if (entering) {
       cmark_strbuf_puts(html, "<sup class=\"footnote-ref\"><a href=\"#fn:");
-      cmark_strbuf_puts(html, node->user_data);
+      cmark_strbuf_put(html, node->parent_footnote_def->as.literal.data, node->parent_footnote_def->as.literal.len);
       cmark_strbuf_puts(html, "\" id=\"fnref:");
-      cmark_strbuf_puts(html, node->user_data);
+      cmark_strbuf_put(html, node->parent_footnote_def->as.literal.data, node->parent_footnote_def->as.literal.len);
 
       if (node->footnote.ref_ix > 1) {
         char n[32];

src/node.h

@@ -81,6 +81,8 @@ struct cmark_node {
     int def_count;
   } footnote;
 
+  cmark_node *parent_footnote_def;
+
   union {
     cmark_chunk literal;
     cmark_list list;