From: Andrew M. Kuchling <amk@amk.ca>
Date: Thu, 22 May 2003 17:25:21 +0000 (+0000)
Subject: Backport fix for SF bug #741171: pdb crashes when enabling a non-existing breakpoint
X-Git-Tag: v2.2.3c1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c012951f65760bb395425942dd3d99b029785a68;p=thirdparty%2FPython%2Fcpython.git

Backport fix for SF bug #741171: pdb crashes when enabling a non-existing breakpoint
---

diff --git a/Lib/pdb.py b/Lib/pdb.py
index ff7c0709a05c..1bcf9512d4d7 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -367,14 +367,34 @@ class Pdb(bdb.Bdb, cmd.Cmd):
     def do_enable(self, arg):
         args = arg.split()
         for i in args:
-            bp = bdb.Breakpoint.bpbynumber[int(i)]
+            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
+
+            bp = bdb.Breakpoint.bpbynumber[i]
             if bp:
                 bp.enable()
 
     def do_disable(self, arg):
         args = arg.split()
         for i in args:
-            bp = bdb.Breakpoint.bpbynumber[int(i)]
+            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
+
+            bp = bdb.Breakpoint.bpbynumber[i]
             if bp:
                 bp.disable()