diff options
author | Ludovic Courtès <ludo@gnu.org> | 2018-06-28 17:14:08 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-08-07 12:14:10 +0200 |
commit | bab01b46edeec71ed1391a44d715741b418df0b0 (patch) | |
tree | b43c28d177112572fe5e92b96d4f213fe7baa189 | |
parent | 6a95c8e77a17d6828a48dcc84500241f48f8284b (diff) | |
download | guile-bab01b46edeec71ed1391a44d715741b418df0b0.tar.gz |
linker: Don't rely on out-of-range bv-ref exceptions.
* module/system/vm/linker.scm (find-shstrndx): Check whether NAME is
lower than the length of BV; remove 'false-if-exception' around
'string-table-ref' call.
-rw-r--r-- | module/system/vm/linker.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/system/vm/linker.scm b/module/system/vm/linker.scm index 6ad582a9d..80c3dcf9e 100644 --- a/module/system/vm/linker.scm +++ b/module/system/vm/linker.scm @@ -1,6 +1,6 @@ ;;; Guile ELF linker -;; Copyright (C) 2011, 2012, 2013, 2014 Free Software Foundation, Inc. +;; Copyright (C) 2011, 2012, 2013, 2014, 2018 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 @@ -478,8 +478,8 @@ section index." (bv (linker-object-bv object)) (name (elf-section-name section))) (and (= (elf-section-type section) SHT_STRTAB) - (equal? (false-if-exception (string-table-ref bv name)) - ".shstrtab") + (< name (bytevector-length bv)) + (string=? (string-table-ref bv name) ".shstrtab") (elf-section-index section)))) objects)) |