hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-14 11:19:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Harden _relative_path for Windows and mixed-form inputs

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Paolo Tranquilli
2026-05-13 11:35:02 +02:00
parent d28792537b
commit ee13ea0f6b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python/extractor/semmle/logging.py
View File

@@ -366,11 +366,16 @@ def _get_source_root():
def _relative_path(path):
"""Make a path relative to the source root for use in diagnostic locations.
If the path is not under the source root, return it unchanged."""
source_root = _get_source_root()
relpath = os.path.relpath(path, source_root)
source_root = os.path.abspath(_get_source_root())
abs_path = os.path.abspath(path)
try:
relpath = os.path.relpath(abs_path, source_root)
except ValueError:
# On Windows, relpath raises ValueError for paths on different drives
return path
if relpath.startswith(os.pardir):
return path
return relpath
return relpath.replace(os.sep, "/")
def syntax_error_message(exception, unit):
diag_path = _relative_path(unit.path)