summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-10-25 10:46:25 -0700
committerLudovic Courtès <ludo@gnu.org>2017-10-25 10:48:50 -0700
commitbf060d2affbfea8e7b69d160b8214d791661f236 (patch)
tree0ce026b63349bd1540c352f665575aa8e026c433
parenta74d4ee4f6e062ff640f2532c9cfc9977bb68a49 (diff)
downloadguile-bf060d2affbfea8e7b69d160b8214d791661f236.tar.gz
'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.
-rw-r--r--module/system/vm/traps.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/module/system/vm/traps.scm b/module/system/vm/traps.scm
index c4861c925..8bee10355 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