mirrors/debugpy
1
0
Fork 0
mirror of https://github.com/microsoft/debugpy.git synced 2025-12-23 08:48:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Protect against exception in linecache.getline. Fixes #969

Browse source
This commit is contained in:
Fabio Zadrozny 2022-07-07 10:22:02 -03:00 • committed by Pavel Minaev
parent 4f2a4568f0
commit 3f325f58dc
3 changed files with 2272 additions and 2225 deletions
Download patch file Download diff file Expand all files Collapse all files

4483
src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.c
View file

File diff suppressed because it is too large Load diff

7
src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.pyx
View file

@ -509,8 +509,7 @@ cdef class PyDBFrame:
try:
linecache.checkcache(absolute_filename)
except:
# Jython 2.1
linecache.checkcache()
pydev_log.exception('Error in linecache.checkcache(%r)', absolute_filename)
from_user_input = main_debugger.filename_to_lines_where_exceptions_are_ignored.get(canonical_normalized_filename)
if from_user_input:
@ -531,8 +530,8 @@ cdef class PyDBFrame:
try:
line = linecache.getline(absolute_filename, exc_lineno, check_trace_obj.tb_frame.f_globals)
except:
# Jython 2.1
line = linecache.getline(absolute_filename, exc_lineno)
pydev_log.exception('Error in linecache.getline(%r, %s, f_globals)', absolute_filename, exc_lineno)
line = ''
if IGNORE_EXCEPTION_TAG.match(line) is not None:
lines_ignored[exc_lineno] = 1

7
src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_frame.py
View file

@ -376,8 +376,7 @@ class PyDBFrame:
try:
linecache.checkcache(absolute_filename)
except:
# Jython 2.1
linecache.checkcache()
pydev_log.exception('Error in linecache.checkcache(%r)', absolute_filename)
from_user_input = main_debugger.filename_to_lines_where_exceptions_are_ignored.get(canonical_normalized_filename)
if from_user_input:
@ -398,8 +397,8 @@ class PyDBFrame:
try:
line = linecache.getline(absolute_filename, exc_lineno, check_trace_obj.tb_frame.f_globals)
except:
# Jython 2.1
line = linecache.getline(absolute_filename, exc_lineno)
pydev_log.exception('Error in linecache.getline(%r, %s, f_globals)', absolute_filename, exc_lineno)
line = ''
if IGNORE_EXCEPTION_TAG.match(line) is not None:
lines_ignored[exc_lineno] = 1