PR 7012

	* dwarf2.c (find_line): Don't keep stale pointers into realloc'd
	memory.  Return on errors.  Fix memory leak.
	(_bfd_dwarf2_cleanup_debug_info): Free dwarf_str_buffer.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 863a0aff2c01dd627396fb1aa194f1d2907a0c00..86aa2765530aa95bd1337cbbb792e89ca39eca94 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-11  Alan Modra  <amodra@bigpond.net.au>
+
+       PR 7012
+       * dwarf2.c (find_line): Don't keep stale pointers into realloc'd
+       memory.  Return on errors.  Fix memory leak.
+       (_bfd_dwarf2_cleanup_debug_info): Free dwarf_str_buffer.
+
 2008-11-10  Andreas Schwab  <schwab@suse.de>
 
        PR 7011

diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index a4918accc4596bd9abf92ee16ef2591d31d81e89..b53a5d45d6e53c0e05ef1aa0363bfb5056eff493 100644 (file)
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -2989,8 +2989,6 @@ find_line (bfd *abfd,
                              symbols, 0,
                              &stash->info_ptr_memory, &total_size))
            goto done;
-         stash->info_ptr = stash->info_ptr_memory;
-         stash->info_ptr_end = stash->info_ptr + total_size;
        }
       else
        {
@@ -3008,63 +3006,64 @@ find_line (bfd *abfd,
              if (stash->info_ptr_memory == NULL)
                goto done;
 
-             stash->info_ptr = stash->info_ptr_memory;
-             stash->info_ptr_end = stash->info_ptr;
-
+             total_size = 0;
              for (msec = find_debug_info (debug_bfd, NULL);
                   msec;
                   msec = find_debug_info (debug_bfd, msec))
                {
                  bfd_size_type size;
-                 bfd_size_type start;
 
                  size = msec->size;
                  if (size == 0)
                    continue;
 
-                 start = stash->info_ptr_end - stash->info_ptr;
-
-                 if ((bfd_simple_get_relocated_section_contents
-                      (debug_bfd, msec, stash->info_ptr + start, symbols))
-                     == NULL)
-                   continue;
+                 if (!(bfd_simple_get_relocated_section_contents
+                       (debug_bfd, msec, stash->info_ptr_memory + total_size,
+                        symbols)))
+                   goto done;
 
-                 stash->info_ptr_end = stash->info_ptr + start + size;
+                 total_size += size;
                }
-
-             BFD_ASSERT (stash->info_ptr_end == stash->info_ptr + total_size);
            }
          else
            {
              /* Case 3: multiple sections, some or all compressed.  */
-             stash->info_ptr_memory = bfd_malloc (1);
-             stash->info_ptr = stash->info_ptr_memory;
-             stash->info_ptr_end = stash->info_ptr;
+             stash->info_ptr_memory = NULL;
+             total_size = 0;
              for (msec = find_debug_info (debug_bfd, NULL);
                   msec;
                   msec = find_debug_info (debug_bfd, msec))
                {
                  bfd_size_type size = msec->size;
-                 bfd_byte* buffer
-                     = (bfd_simple_get_relocated_section_contents
-                        (debug_bfd, msec, NULL, symbols));
-                 if (! buffer)
+                 bfd_byte* buffer;
+
+                 if (size == 0)
                    continue;
+
+                 buffer = (bfd_simple_get_relocated_section_contents
+                           (debug_bfd, msec, NULL, symbols));
+                 if (! buffer)
+                   goto done;
+
                  if (strcmp (msec->name, DWARF2_COMPRESSED_DEBUG_INFO) == 0)
                    {
                      if (! bfd_uncompress_section_contents (&buffer, &size))
-                       continue;
+                       {
+                         free (buffer);
+                         goto done;
+                       }
                    }
-                 stash->info_ptr = bfd_realloc (stash->info_ptr,
-                                                stash->info_ptr_end
-                                                - stash->info_ptr + size);
-                 memcpy (stash->info_ptr_end, buffer, size);
+                 stash->info_ptr_memory = bfd_realloc (stash->info_ptr_memory,
+                                                       total_size + size);
+                 memcpy (stash->info_ptr_memory + total_size, buffer, size);
                  free (buffer);
-                 stash->info_ptr_end += size;
+                 total_size += size;
                }
            }
        }
 
+      stash->info_ptr = stash->info_ptr_memory;
+      stash->info_ptr_end = stash->info_ptr + total_size;
       stash->sec = find_debug_info (debug_bfd, NULL);
       stash->sec_info_ptr = stash->info_ptr;
       stash->syms = symbols;
@@ -3364,8 +3363,14 @@ _bfd_dwarf2_cleanup_debug_info (bfd *abfd)
        }
     }
 
-  free (stash->dwarf_abbrev_buffer);
-  free (stash->dwarf_line_buffer);
-  free (stash->dwarf_ranges_buffer);
-  free (stash->info_ptr_memory);
+  if (stash->dwarf_abbrev_buffer)
+    free (stash->dwarf_abbrev_buffer);
+  if (stash->dwarf_line_buffer)
+    free (stash->dwarf_line_buffer);
+  if (stash->dwarf_str_buffer)
+    free (stash->dwarf_str_buffer);
+  if (stash->dwarf_ranges_buffer)
+    free (stash->dwarf_ranges_buffer);
+  if (stash->info_ptr_memory)
+    free (stash->info_ptr_memory);
 }