Skip to content

Fix infinite loop in markdown parsing #28

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

Closed
wants to merge 1 commit into from
Closed

Fix infinite loop in markdown parsing #28

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
14 changes: 12 additions & 2 deletions Sources/SwiftParser/Languages/MarkdownLanguage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,12 +831,14 @@ public struct MarkdownLanguage: CodeLanguage {
return false
}
public func build(context: inout CodeContext) {
if context.index < context.tokens.count,
let tok = context.tokens[context.index] as? Token {
guard context.index < context.tokens.count else { return }
var consumed = false
if let tok = context.tokens[context.index] as? Token {
let kind = tok.kindDescription
while context.index < context.tokens.count {
if let t = context.tokens[context.index] as? Token,
t.kindDescription == kind {
consumed = true
context.index += 1
} else {
break
Expand All @@ -847,6 +849,9 @@ public struct MarkdownLanguage: CodeLanguage {
let nl = context.tokens[context.index] as? Token,
case .newline = nl {
context.index += 1
} else if !consumed {
// Ensure progress even if the line is malformed
context.index += 1
}
context.currentNode.addChild(MarkdownThematicBreakNode(value: ""))
}
Expand Down Expand Up @@ -1046,7 +1051,9 @@ public struct MarkdownLanguage: CodeLanguage {
var cells: [String] = []
var cell = ""
context.index += 1 // skip first pipe
var progressed = false
while context.index < context.tokens.count {
progressed = true
if let tok = context.tokens[context.index] as? Token {
switch tok {
case .pipe:
Expand Down Expand Up @@ -1075,6 +1082,9 @@ public struct MarkdownLanguage: CodeLanguage {
cells.append(cell.trimmingCharacters(in: .whitespaces))
context.currentNode.addChild(MarkdownTableNode(value: cells.joined(separator: "|")))
}
if !progressed {
context.index += 1
}
}
}

Expand Down