PR22232, NULL pointer dereference in load_specific_debug_section

[deliverable/binutils-gdb.git] / binutils / dwarf-mode.el

diff --git a/binutils/dwarf-mode.el b/binutils/dwarf-mode.el
index 4c995ef763b30f4965dac5f2ab5e12270df605ed..a944a77c8cc2f9ada101a9e533abf031cdfe48d9 100644 (file)
--- a/binutils/dwarf-mode.el
+++ b/binutils/dwarf-mode.el
@@ -1,6 +1,8 @@
 ;;; dwarf-mode.el --- Browser for DWARF information.
 
-;; Version: 1.1
+;; Version: 1.3
+
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 ;; This file is not part of GNU Emacs, but is distributed under the
 ;; same terms:
@@ -96,7 +98,7 @@ A prefix argument means expand all children."
   'action #'dwarf-die-button-action)
 
 ;; Helper regexp to match a DIE reference.
-(defconst dwarf-die-reference ": \\(<0x\\([0-9a-f]+\\)>\\)\\s *$")
+(defconst dwarf-die-reference "\\(<0x\\([0-9a-f]+\\)>\\)")
 
 ;; Helper regexp to match a `...' indicating that there are hidden
 ;; children.
@@ -139,7 +141,6 @@ A prefix argument means expand all children."
                    (expand-file-name dwarf-file)))
     (set-buffer-modified-p nil)))
 
-;;;###autoload
 (define-derived-mode dwarf-mode special-mode "DWARF"
   "Major mode for browsing DWARF output.
 
@@ -161,6 +162,7 @@ This is the main interface to `dwarf-mode'."
         (buffer (generate-new-buffer (concat "*DWARF for " base-name "*"))))
     (pop-to-buffer buffer)
     (dwarf-mode)
+    (setq default-directory (file-name-directory file))
     (set (make-local-variable 'dwarf-file) file)
     (dwarf-do-refresh)))