fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-24 00:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

PICARD-2214: Fix exception if script ends with backslash

Browse Source
This commit is contained in:
Philipp Wolfer
2021-05-28 12:02:18 +02:00
parent 3ea4f6419b
commit c80e7ea758
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
picard/script/parser.py
View File

@@ -321,6 +321,8 @@ Grammar:
text.append(chr(int(codepoint, 16)))
except (TypeError, ValueError):
self.__raise_unicode(codepoint)
elif ch is None:
self.__raise_eof()
elif ch not in "$%(),\\":
self.__raise_char(ch)
else:

6
test/test_script.py
View File

@@ -1010,6 +1010,12 @@ class ScriptParserTest(PicardTestCase):
def test_char_escape(self):
self.assertScriptResultEquals(r"\n\t\$\%\(\)\,\\", "\n\t$%(),\\")
def test_char_escape_unexpected_char(self):
self.assertRaises(ScriptSyntaxError, self.parser.eval, r'\x')
def test_char_escape_end_of_file(self):
self.assertRaises(ScriptEndOfFile, self.parser.eval, 'foo\\')
def test_raise_unknown_function(self):
self.assertRaises(ScriptUnknownFunction, self.parser.eval, '$unknownfn()')