diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8a028cf0323..ad750bcd9a2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-15  Tom Tromey  <tromey@adacore.com>
+
+	* dwarf2.c (scan_unit_for_symbols): Check for end of CU, not end
+	of section.
+
 2019-08-14  Alan Modra  <amodra@gmail.com>
 
 	PR 24623
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 057fd913173..d56244b8ff0 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -3072,7 +3072,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
 {
   bfd *abfd = unit->abfd;
   bfd_byte *info_ptr = unit->first_child_die_ptr;
-  bfd_byte *info_ptr_end = unit->stash->info_ptr_end;
+  bfd_byte *info_ptr_end = unit->end_ptr;
   int nesting_level = 0;
   struct nest_funcinfo {
     struct funcinfo *func;