Commitfd55320

authored and

committed

Backport PR#20473: _GSConverter: handle stray 'GS' in output gracefully

1 parent09dcdf2 commitfd55320Copy full SHA for fd55320

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ def _read_until(self, terminator):`
`124`	`124`	`raise_ConverterError`
`125`	`125`	`buf.extend(c)`
`126`	`126`	`ifbuf.endswith(terminator):`
`127`		`-returnbytes(buf[:-len(terminator)])`
	`127`	`+returnbytes(buf)`
`128`	`128`
`129`	`129`
`130`	`130`	`class_GSConverter(_Converter):`
`@@ -154,15 +154,16 @@ def encode_and_escape(name):`
`154`	`154`	`+b") run flush\n")`
`155`	`155`	`self._proc.stdin.flush()`
`156`	`156`	`# GS> if nothing left on the stack; GS<n> if n items left on the stack.`
`157`		`-err=self._read_until(b"GS")`
`158`		`-stack=self._read_until(b">")`
	`157`	`+err=self._read_until((b"GS<",b"GS>"))`
	`158`	`+stack=""`
	`159`	`+iferr.endswith(b"GS<"):`
	`160`	`+stack=self._read_until(b">")`
`159`	`161`	`ifstackornotos.path.exists(dest):`
`160`		`-stack_size=int(stack[1:])ifstackelse0`
	`162`	`+stack_size=int(stack[:-1])ifstackelse0`
`161`	`163`	`self._proc.stdin.write(b"pop\n"*stack_size)`
`162`	`164`	`# Using the systemencoding should at least get the filenames right.`
`163`	`165`	`raiseImageComparisonFailure(`
`164`		`- (err+b"GS"+stack+b">")`
`165`		`- .decode(sys.getfilesystemencoding(),"replace"))`
	`166`	`+ (err+stack).decode(sys.getfilesystemencoding(),"replace"))`
`166`	`167`
`167`	`168`
`168`	`169`	`class_SVGConverter(_Converter):`

Comments

(0)