From be2778bffc67f94d3a31aa146a0f46aba6d13aca Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 13 Oct 2020 21:21:09 -0400 Subject: [PATCH] fixed bandit issus --- pdfmajor/tokenizer/token_parsers/literal.py | 11 ++++++----- pdfmajor/tokenizer/token_parsers/number.py | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pdfmajor/tokenizer/token_parsers/literal.py b/pdfmajor/tokenizer/token_parsers/literal.py index 9ddaea1..890639f 100644 --- a/pdfmajor/tokenizer/token_parsers/literal.py +++ b/pdfmajor/tokenizer/token_parsers/literal.py @@ -1,5 +1,5 @@ from dataclasses import dataclass -from pdfmajor.tokenizer.exceptions import TokenizerEOF +from pdfmajor.tokenizer.exceptions import TokenizerEOF, TokenizerError from pdfmajor.tokenizer.token_parsers.util import cmp_tsize from pdfmajor.tokenizer.token_parsers.util import PInput @@ -20,17 +20,18 @@ def parse_literal(initialpos: int, inp: Iterator[PInput]) -> TokenLiteral: """Parses input stream into a literal Args: - initialpos (int): initial position where we started - inp (Iterator[PInput]) + initialpos (int): initial position where we started + inp (Iterator[PInput]) Returns: - TokenLiteral + TokenLiteral """ state = LiteralParseState(b"") for curpos, buf in inp: skip: int = 0 for i in range(len(buf) + 1): - assert i < len(buf), "MAX_LOOP_REACHED" + if i < len(buf): + raise TokenizerEOF("Max Iteration Reached!") if skip >= len(buf): break if state.hex_value is not None: diff --git a/pdfmajor/tokenizer/token_parsers/number.py b/pdfmajor/tokenizer/token_parsers/number.py index c00bc28..1e5093c 100644 --- a/pdfmajor/tokenizer/token_parsers/number.py +++ b/pdfmajor/tokenizer/token_parsers/number.py @@ -20,14 +20,15 @@ def parse_number( """Parses input stream into a number Args: - initialpos (int): initial position where we started - inp (Iterator[PInput]) - sign (str): either a + or - + initialpos (int): initial position where we started + inp (Iterator[PInput]) + sign (str): either a + or - Returns: - TokenNumber + TokenNumber """ - assert sign in [b"+", b"-"], "Number was provided an invalid sign {!r}".format(sign) + if sign not in [b"+", b"-"]: + raise InvalidToken("Number was provided an invalid sign {!r}".format(sign)) curtoken = b"" + sign is_dec = False for curpos, s in inp: