Guard against 'current_directory == NULL' on gdb_abspath (PR gdb/23613)

[deliverable/binutils-gdb.git] / opcodes / z80-dis.c

diff --git a/opcodes/z80-dis.c b/opcodes/z80-dis.c
index bdb2a4ff08fc1545b63dc6aa6a2706bd5a8b26fa..e30d6383de31cd53239cee04dea4d3376c9359f0 100644 (file)
--- a/opcodes/z80-dis.c
+++ b/opcodes/z80-dis.c
@@ -1,5 +1,5 @@
 /* Print Z80 and R800 instructions
-   Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005-2019 Free Software Foundation, Inc.
    Contributed by Arnold Metselaar <arnold_m@operamail.com>
 
    This file is part of the GNU opcodes library.
@@ -20,7 +20,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include <stdio.h>
 
 struct buffer
@@ -130,7 +130,7 @@ prt_rr_nn (struct buffer *buf, disassemble_info * info, char *txt)
   char mytxt[TXTSIZ];
   int rr;
 
-  rr = (buf->data[buf->n_fetch - 1] >> 4) & 3; 
+  rr = (buf->data[buf->n_fetch - 1] >> 4) & 3;
   snprintf (mytxt, TXTSIZ, txt, rr_str[rr]);
   return prt_nn (buf, info, mytxt);
 }
@@ -314,7 +314,7 @@ struct tab_elt opc_ed[] =
 };
 
 static int
-pref_ed (struct buffer * buf, disassemble_info * info, 
+pref_ed (struct buffer * buf, disassemble_info * info,
         char* txt ATTRIBUTE_UNUSED)
 {
   struct tab_elt *p;