Improve `check_exception_against_list` matching logic using regex · gitpython-developers/GitPython@799b9ca · GitHub

1. gitpython-developers
2. GitPython

Repository navigation

• Code
• Issues6 (6)
• Pull requests
• Discussions
• Actions
• Security and quality42 (42)
• Insights

Commit 799b9ca

Browse filesBrowse the repository at this point in the historyBrowse files

DaveLak

committed

Improve check_exception_against_list matching logic using regex

Changes: - `match_exception_with_traceback` uses regular expressions for more flexible matching of file paths and line numbers. This allows for partial matches and more complex patterns. - Improve `check_exception_against_list` by delegating to `match_exception_with_traceback` for checking tracebacks against exception list entries. - `load_exception_list`: Remains largely unchanged, as it correctly parses the file and line number from each exception entry. However, we ensure the set consists of regex patterns to match against tracebacks.

1 parent 7de1556 commit 799b9ca
Copy full SHA for 799b9ca

1 file changed

+12-8Lines changed: 12 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• fuzzing/fuzz-targets
  • fuzz_submodule.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎fuzzing/fuzz-targets/fuzz_submodule.py‎

Copy file name to clipboardExpand all lines: fuzzing/fuzz-targets/fuzz_submodule.py

+12-8Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -31,21 +31,27 @@ def load_exception_list(file_path):
31	31	exception_list.add((file_path, line_number))
32	32	return exception_list
33	33	except FileNotFoundError:
34		- print("File not found: %s", file_path)
	34	+ print(f"File not found: {file_path}")
35	35	return set()
36	36	except Exception as e:
37		- print("Error loading exception list: %s", e)
	37	+ print(f"Error loading exception list: {e}")
38	38	return set()
39	39
40	40
41		- def check_exception_against_list(exception_list, exc_traceback):
42		- """Check if the exception traceback matches any entry in the exception list."""
	41	+ def match_exception_with_traceback(exception_list, exc_traceback):
	42	+ """Match exception traceback with the entries in the exception list."""
43	43	for filename, lineno, _, _ in traceback.extract_tb(exc_traceback):
44		- if (filename, lineno) in exception_list:
45		- return True
	44	+ for file_pattern, line_pattern in exception_list:
	45	+ if re.fullmatch(file_pattern, filename) and re.fullmatch(line_pattern, str(lineno)):
	46	+ return True
46	47	return False
47	48
48	49
	50	+ def check_exception_against_list(exception_list, exc_traceback):
	51	+ """Check if the exception traceback matches any entry in the exception list."""
	52	+ return match_exception_with_traceback(exception_list, exc_traceback)
	53	+
	54	+
49	55	if not sys.warnoptions: # pragma: no cover
50	56	# The warnings filter below can be overridden by passing the -W option
51	57	# to the Python interpreter command line or setting the `PYTHONWARNINGS` environment variable.
@@ -128,10 +134,8 @@ def TestOneInput(data):
128	134	exc_traceback = e.__traceback__
129	135	exception_list = load_exception_list(os.path.join(bundle_dir, "explicit-exceptions-list.txt"))
130	136	if check_exception_against_list(exception_list, exc_traceback):
131		- print("Exception matches an entry in the exception list.")
132	137	return -1
133	138	else:
134		- print("Exception does not match any entry in the exception list.")
135	139	raise e
136	140
137	141

0 commit comments

Comments

0 (0)