From: Georg Brandl <georg@python.org>
Date: Wed, 3 May 2006 18:12:36 +0000 (+0000)
Subject: Bug #1472191: convert breakpoint indices to ints before comparing them to ints
X-Git-Tag: v2.4.4c1~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba3429bac9fb6b6df7b66332152c91eea8063700;p=thirdparty%2FPython%2Fcpython.git

Bug #1472191: convert breakpoint indices to ints before comparing them to ints
 (backport from rev. 45891)
---

diff --git a/Lib/pdb.py b/Lib/pdb.py
index b00f68b79d50..daddb9c7f820 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -442,7 +442,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
             arg = arg[i+1:]
             try:
                 lineno = int(arg)
-            except:
+            except ValueError:
                 err = "Invalid line number (%s)" % arg
             else:
                 err = self.clear_break(filename, lineno)
@@ -450,6 +450,12 @@ class Pdb(bdb.Bdb, cmd.Cmd):
             return
         numberlist = arg.split()
         for i in numberlist:
+            try:
+                i = int(i)
+            except ValueError:
+                print 'Breakpoint index %r is not a number' % i
+                continue
+
             if not (0 <= i < len(bdb.Breakpoint.bpbynumber)):
                 print 'No breakpoint numbered', i
                 continue