[Guile-commits] 01/02: 'frame-matcher' doesn't crash when the last IP is unknown.

[Ludovic Courtès]

civodul pushed a commit to branch stable-2.2
in repository guile.

commit bf060d2affbfea8e7b69d160b8214d791661f236
Author: Ludovic Courtès <address@hidden>
Date:   Wed Oct 25 10:46:25 2017 -0700

    'frame-matcher' doesn't crash when the last IP is unknown.
    
    This fixes a bug when using ",break":
    
      system/vm/traps.scm:127:31: system/vm/traps.scm:127:31: In procedure <: 
Wrong type: #f
    
    * module/system/vm/traps.scm (frame-matcher): Check whether END is
    true.
---
 module/system/vm/traps.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/system/vm/traps.scm b/module/system/vm/traps.scm
index c4861c9..8bee103 100644
--- a/module/system/vm/traps.scm
+++ b/module/system/vm/traps.scm
@@ -1,6 +1,6 @@
 ;;; Traps: stepping, breakpoints, and such.
 
-;; Copyright (C)  2010, 2012, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (C)  2010, 2012, 2013, 2014, 2017 Free Software Foundation, Inc.
 
 ;;; This library is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
@@ -124,7 +124,8 @@
             (end (program-last-ip proc)))
         (lambda (frame)
           (let ((ip (frame-instruction-pointer frame)))
-            (and (<= start ip) (< ip end))))))
+            (and (<= start ip)
+                 end (< ip end))))))
      ((struct? proc)
       (frame-matcher (procedure proc)))
      (else