GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-10 21:36:55 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix infinite loop on unclosed {{/<%

Browse source
This commit is contained in:
Damien Elmes 2020-04-20 10:33:09 +10:00
parent a226f70733
commit c34e3e8096
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rslib/src/template.rs
View file

@ -8,7 +8,7 @@ use lazy_static::lazy_static;
use nom::branch::alt; use nom::branch::alt;
use nom::bytes::complete::{tag, take_until}; use nom::bytes::complete::{tag, take_until};
use nom::{ use nom::{
combinator::{map, rest}, combinator::{map, rest, verify},
sequence::delimited, sequence::delimited,
}; };
use regex::Regex; use regex::Regex;
@ -37,7 +37,10 @@ pub enum Token<'a> {
/// text outside handlebars /// text outside handlebars
fn text_token(s: &str) -> nom::IResult<&str, Token> { fn text_token(s: &str) -> nom::IResult<&str, Token> {
map(alt((take_until("{{"), rest)), Token::Text)(s) map(
verify(alt((take_until("{{"), rest)), |out: &str| !out.is_empty()),
Token::Text,
)(s)
} }
/// text wrapped in handlebars /// text wrapped in handlebars
@ -101,9 +104,13 @@ fn classify_handle(s: &str) -> Token {
static ALT_HANDLEBAR_DIRECTIVE: &str = "{{=<% %>=}}"; static ALT_HANDLEBAR_DIRECTIVE: &str = "{{=<% %>=}}";
fn legacy_text_token(s: &str) -> nom::IResult<&str, Token> { fn legacy_text_token(s: &str) -> nom::IResult<&str, Token> {
map(alt((take_until("{{"), take_until("<%"), rest)), |out| { map(
Token::Text(out) verify(
})(s) alt((take_until("{{"), take_until("<%"), rest)),
|out: &str| !out.is_empty(),
),
Token::Text,
)(s)
} }
fn legacy_next_token(input: &str) -> nom::IResult<&str, Token> { fn legacy_next_token(input: &str) -> nom::IResult<&str, Token> {
@ -646,6 +653,10 @@ mod test {
PT::from_text("text }} more").unwrap().0, PT::from_text("text }} more").unwrap().0,
vec![Text("text }} more")] vec![Text("text }} more")]
); );
PT::from_text("{{").unwrap_err();
PT::from_text(" {{").unwrap_err();
PT::from_text(" {{ ").unwrap_err();
} }
#[test] #[test]