From: Jim Blandy <jimb@codesourcery.com>
Date: Mon, 2 Jan 2006 04:31:57 +0000 (+0000)
Subject: 2006-01-01  Roger Sayle  <roger@eyesopen.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=13c763f4972494029fb3245906dae3e9f134d837;p=binutils-gdb.git

2006-01-01  Roger Sayle  <roger@eyesopen.com>
            Elena Zannoni <ezannoni@redhat.com>

	PR symtab/1651
	* xcoffread.c (xcoff_next_symbol_text): Check this_symtab_psymtab
	for NULL before assigning this_symtab_psymtab->objfile to objfile.
	(scan_xcoff_symtab): Initialize next_symbol_text_func.
        (Committed by Jim Blandy)
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd4dd8ada1b..2a9c7f69974 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-01  Roger Sayle  <roger@eyesopen.com>
+            Elena Zannoni <ezannoni@redhat.com>
+
+	PR symtab/1651
+	* xcoffread.c (xcoff_next_symbol_text): Check this_symtab_psymtab
+	for NULL before assigning this_symtab_psymtab->objfile to objfile.
+	(scan_xcoff_symtab): Initialize next_symbol_text_func.
+        (Committed by Jim Blandy)
+
 For older changes see ChangeLog-2005.
 
 Local Variables:
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 08e1a2c5f92..65e5f5f0608 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -868,7 +868,8 @@ xcoff_next_symbol_text (struct objfile *objfile)
   struct internal_syment symbol;
   char *retval;
   /* FIXME: is this the same as the passed arg? */
-  objfile = this_symtab_psymtab->objfile;
+  if (this_symtab_psymtab)
+    objfile = this_symtab_psymtab->objfile;
 
   bfd_coff_swap_sym_in (objfile->obfd, raw_symbol, &symbol);
   if (symbol.n_zeroes)
@@ -2170,6 +2171,7 @@ scan_xcoff_symtab (struct objfile *objfile)
   last_source_file = NULL;
 
   abfd = objfile->obfd;
+  next_symbol_text_func = xcoff_next_symbol_text;
 
   sraw_symbol = ((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl;
   nsyms = ((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl_num_syms;