From e485745c6924e41f2896f579b5454cfb800e13f6 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Fri, 28 Oct 2022 18:28:12 +0200
Subject: Fix GFM tables to require a non-pipe in header row

Related-to: GH-20.
---
 src/construct/gfm_table.rs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/construct/gfm_table.rs')

diff --git a/src/construct/gfm_table.rs b/src/construct/gfm_table.rs
index e055e1d..3f88073 100644
--- a/src/construct/gfm_table.rs
+++ b/src/construct/gfm_table.rs
@@ -312,6 +312,8 @@ pub fn head_row_start(tokenizer: &mut Tokenizer) -> State {
         Some(b'|') => State::Retry(StateName::GfmTableHeadRowBreak),
         _ => {
             tokenizer.tokenize_state.seen = true;
+            // Count the first character, that isn’t a pipe, double.
+            tokenizer.tokenize_state.size_b += 1;
             State::Retry(StateName::GfmTableHeadRowBreak)
         }
     }
@@ -332,22 +334,34 @@ pub fn head_row_break(tokenizer: &mut Tokenizer) -> State {
         None => {
             tokenizer.tokenize_state.seen = false;
             tokenizer.tokenize_state.size = 0;
+            tokenizer.tokenize_state.size_b = 0;
             State::Nok
         }
         Some(b'\n') => {
-            // Feel free to interrupt:
-            tokenizer.interrupt = true;
-            tokenizer.exit(Name::GfmTableRow);
-            tokenizer.enter(Name::LineEnding);
-            tokenizer.consume();
-            tokenizer.exit(Name::LineEnding);
-            State::Next(StateName::GfmTableHeadDelimiterStart)
+            // If anything other than one pipe (ignoring whitespace) was used, it’s fine.
+            if tokenizer.tokenize_state.size_b > 1 {
+                tokenizer.tokenize_state.size_b = 0;
+                // Feel free to interrupt:
+                tokenizer.interrupt = true;
+                tokenizer.exit(Name::GfmTableRow);
+                tokenizer.enter(Name::LineEnding);
+                tokenizer.consume();
+                tokenizer.exit(Name::LineEnding);
+                State::Next(StateName::GfmTableHeadDelimiterStart)
+            } else {
+                tokenizer.tokenize_state.seen = false;
+                tokenizer.tokenize_state.size = 0;
+                tokenizer.tokenize_state.size_b = 0;
+                State::Nok
+            }
         }
         Some(b'\t' | b' ') => {
             tokenizer.attempt(State::Next(StateName::GfmTableHeadRowBreak), State::Nok);
             State::Retry(space_or_tab(tokenizer))
         }
         _ => {
+            tokenizer.tokenize_state.size_b += 1;
+
             // Whether a delimiter was seen.
             if tokenizer.tokenize_state.seen {
                 tokenizer.tokenize_state.seen = false;
-- 
cgit