diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 89c92f46482..a929237dde1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-03  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (dw2_find_symbol_file): Don't crash if there are no
+	files.
+
 2012-05-03  Yao Qi  <yao@codesourcery.com>
 
 	* i386-tdep.c (i386_fetch_pointer_argument): Remove extra
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 0caa5f99bdb..412fe5be474 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2833,7 +2833,8 @@ dw2_find_symbol_file (struct objfile *objfile, const char *name)
   per_cu = dw2_get_cu (MAYBE_SWAP (vec[1]));
 
   file_data = dw2_get_file_names (objfile, per_cu);
-  if (file_data == NULL)
+  if (file_data == NULL
+      || file_data->num_file_names == 0)
     return NULL;
 
   return file_data->file_names[file_data->num_file_names - 1];