Skip to content

Fix uninitialized cell_index on API-created table cells #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BetterAndBetterII wants to merge 1 commit into
base: master
Choose a base branch
from
+63 −1
Open

Fix uninitialized cell_index on API-created table cells #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions api_test/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,65 @@ static void source_pos_inlines(test_batch_runner *runner) {
}
}

static void table_cell_new_with_ext(test_batch_runner *runner) {
static const char markdown[] = "| foo | bar |\n"
"| :-- | --: |\n"
"| baz | bim |\n";

cmark_gfm_core_extensions_ensure_registered();

cmark_parser *parser = cmark_parser_new(CMARK_OPT_DEFAULT);
cmark_syntax_extension *table_ext = cmark_find_syntax_extension("table");
OK(runner, table_ext != NULL, "table extension is registered");
cmark_parser_attach_syntax_extension(parser, table_ext);
cmark_parser_feed(parser, markdown, sizeof(markdown) - 1);
cmark_node *doc = cmark_parser_finish(parser);
cmark_parser_free(parser);

cmark_node *table = cmark_node_first_child(doc);
cmark_node *header = cmark_node_first_child(table);
cmark_node *cell = cmark_node_first_child(header);

cmark_node *new_cell = cmark_node_new_with_ext(
cmark_node_get_type(cell), cmark_node_get_syntax_extension(cell));
INT_EQ(runner, new_cell->as.cell_index, 0,
"table cell created with cmark_node_new_with_ext has cell_index 0");

OK(runner, cmark_node_prepend_child(header, new_cell),
"prepend new table cell");
cmark_node_unlink(cell);
cmark_node_free(cell);

char *html = cmark_render_html(doc, CMARK_OPT_DEFAULT, NULL);
STR_EQ(runner, html,
"<table>\n"
"<thead>\n"
"<tr>\n"
"<th align=\"left\"></th>\n"
"<th align=\"right\">bar</th>\n"
"</tr>\n"
"</thead>\n"
"<tbody>\n"
"<tr>\n"
"<td align=\"left\">baz</td>\n"
"<td align=\"right\">bim</td>\n"
"</tr>\n"
"</tbody>\n"
"</table>\n",
"html render after replacing first header cell");
free(html);

char *xml = cmark_render_xml(doc, CMARK_OPT_DEFAULT);
OK(runner, xml != NULL, "xml render after replacing first header cell");
OK(runner, xml && strstr(xml, "align=\"left\"") != NULL,
"xml includes left alignment for new cell");
OK(runner, xml && strstr(xml, "align=\"right\"") != NULL,
"xml includes right alignment for remaining cell");
free(xml);

cmark_node_free(doc);
}

static void ref_source_pos(test_batch_runner *runner) {
static const char markdown[] =
"Let's try [reference] links.\n"
Expand Down Expand Up @@ -1160,6 +1219,7 @@ int main() {
source_pos(runner);
source_pos_inlines(runner);
ref_source_pos(runner);
table_cell_new_with_ext(runner);

test_print_summary(runner);
retval = test_ok(runner) ? 0 : 1;
Expand Down
4 changes: 3 additions & 1 deletion extensions/table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,9 @@ static void opaque_alloc(cmark_syntax_extension *self, cmark_mem *mem, cmark_nod
} else if (node->type == CMARK_NODE_TABLE_ROW) {
node->as.opaque = mem->calloc(1, sizeof(node_table_row));
} else if (node->type == CMARK_NODE_TABLE_CELL) {
node->as.opaque = mem->calloc(1, sizeof(node_cell));
// cell_index shares the `as` union with opaque. Do not allocate a
// node_cell here: that would store a pointer as the column index.
node->as.cell_index = 0;
}
}

Expand Down