backport bug [ 1192315 ] 'clear -1' in pdb

diff --git a/Lib/pdb.py b/Lib/pdb.py
index 7b5dffa3b6479126736f6277ae79d95ed32bede6..b00f68b79d50f7f20305b13565fabc31e1191ed9 100755 (executable)
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -450,11 +450,14 @@ class Pdb(bdb.Bdb, cmd.Cmd):
             return
         numberlist = arg.split()
         for i in numberlist:
+            if not (0 <= i < len(bdb.Breakpoint.bpbynumber)):
+                print 'No breakpoint numbered', i
+                continue
             err = self.clear_bpbynumber(i)
             if err:
                 print '***', err
             else:
-                print 'Deleted breakpoint %s ' % (i,)
+                print 'Deleted breakpoint', i
     do_cl = do_clear # 'c' is already an abbreviation for 'continue'
 
     def do_where(self, arg):

diff --git a/Misc/NEWS b/Misc/NEWS
index 55219f54d9d316e9c1d891dba48c9100ac9d37c0..48a7d89b2c2494ebcb1c83724b468f8c3ca3828c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,8 @@ Library
 
 - The sets module can now properly compute s-=s and s^=s as an empty set.
 
+- Bug #1192315: Disallow negative arguments to clear() in pdb.
+
 - Patch #827386: Support absolute source paths in msvccompiler.py.
 
 - Fix a problem in Tkinter introduced by SF patch #869468: delete bogus