Commit 3468ba50 authored by Collin Winter's avatar Collin Winter

Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the...

Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
Backport of r54271.
parent de8c668d
......@@ -485,7 +485,11 @@ class Pdb(bdb.Bdb, cmd.Cmd):
cond = args[1]
except:
cond = None
bp = bdb.Breakpoint.bpbynumber[bpnum]
try:
bp = bdb.Breakpoint.bpbynumber[bpnum]
except IndexError:
print >>self.stdout, 'Breakpoint index %r is not valid' % args[0]
return
if bp:
bp.cond = cond
if not cond:
......@@ -506,7 +510,11 @@ class Pdb(bdb.Bdb, cmd.Cmd):
count = int(args[1].strip())
except:
count = 0
bp = bdb.Breakpoint.bpbynumber[bpnum]
try:
bp = bdb.Breakpoint.bpbynumber[bpnum]
except IndexError:
print >>self.stdout, 'Breakpoint index %r is not valid' % args[0]
return
if bp:
bp.ignore = count
if count > 0:
......
......@@ -199,6 +199,9 @@ Extension Modules
Library
-------
- Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap
the IndexError caused by passing in an invalid breakpoint number.
- Bug #1531963: Make SocketServer.TCPServer's server_address always
be equal to calling getsockname() on the server's socket. Fixed by patch
#1545011.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment