From c8db9c87e52f3dcf2b0d0ce6ca4065c5f7a14ddf Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 7 Nov 2026 11:44:57 -0800 Subject: [PATCH] Fix incorrect source position for ATX heading with no content. This was caused by a bug in `chop_trailing_hashtags`. Add test in api tests. Closes #656. --- api_test/main.c | 13 ++++++++----- src/blocks.c | 22 +++++++++++++++++----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/api_test/main.c b/api_test/main.c index fcf0e8b1f..c5d47d655 100644 --- a/api_test/main.c +++ b/api_test/main.c @@ -1120,13 +1120,15 @@ static void source_pos(test_batch_runner *runner) { "> Sure.\n" ">\n" "> 2. Yes, okay.\n" - "> ![ok](hi \"yes\")\n"; + "> ![ok](hi \"yes\")\n" + ">\n" + "> #\n"; cmark_node *doc = cmark_parse_document(markdown, sizeof(markdown) - 1, CMARK_OPT_DEFAULT); char *xml = cmark_render_xml(doc, CMARK_OPT_DEFAULT | CMARK_OPT_SOURCEPOS); STR_EQ(runner, xml, "\n" "\n" - "\n" + "\n" " \n" " Hi *\n" " \n" @@ -1148,8 +1150,8 @@ static void source_pos(test_batch_runner *runner) { " \n" " .\n" " \n" - " \n" - " \n" + " \n" + " \n" " \n" " \n" " Okay.\n" @@ -1157,7 +1159,7 @@ static void source_pos(test_batch_runner *runner) { " Sure.\n" " \n" " \n" - " \n" + " \n" " \n" " Yes, okay.\n" " \n" @@ -1167,6 +1169,7 @@ static void source_pos(test_batch_runner *runner) { " \n" " \n" " \n" + " \n" " \n" "\n", "sourcepos are as expected"); diff --git a/src/blocks.c b/src/blocks.c index 7500df822..dea494d86 100644 --- a/src/blocks.c +++ b/src/blocks.c @@ -658,7 +658,7 @@ static void S_parser_feed(cmark_parser *parser, const unsigned char *buffer, } static void chop_trailing_hashtags(cmark_chunk *ch) { - bufsize_t n, orig_n; + bufsize_t n, orig_n, i; cmark_chunk_rtrim(ch); orig_n = n = ch->len - 1; @@ -668,10 +668,22 @@ static void chop_trailing_hashtags(cmark_chunk *ch) { n--; // Check for a space before the final #s: - if (n != orig_n && n >= 0 && S_is_space_or_tab(peek_at(ch, n))) { - ch->len = n; - cmark_chunk_rtrim(ch); + if (n == orig_n || n < 0 || !S_is_space_or_tab(peek_at(ch, n))) { + return; } + + // Check to make sure we have #s at beginning (see issue #656): + i = n; + while (i >= 0 && peek_at(ch, i) != '#') { + i--; + } + + if (i < 0) { // We didn't find #, hence we had empty header (#656) + return; + } + + ch->len = n; + cmark_chunk_rtrim(ch); } // Check for thematic break. On failure, return 0 and update @@ -1262,7 +1274,7 @@ static void add_text_to_container(cmark_parser *parser, cmark_node *container, } else if (accepts_lines(S_type(container))) { if (S_type(container) == CMARK_NODE_HEADING && container->as.heading.setext == false) { - chop_trailing_hashtags(input); + chop_trailing_hashtags(input); } S_advance_offset(parser, input, parser->first_nonspace - parser->offset, false);