gdb: allocate symfile_segment_data with new

[deliverable/binutils-gdb.git] / gdb / solib-target.c

diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 93d95fdda6525228df8d35a40d3ccf91d6640b97..35e50a3e00b4d371bc2d318ccb89ff918253d373 100644 (file)
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -364,9 +364,9 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
        }
       else if (!li->segment_bases.empty ())
        {
-         struct symfile_segment_data *data;
+         symfile_segment_data_up data
+           = get_symfile_segment_data (so->abfd);
 
-         data = get_symfile_segment_data (so->abfd);
          if (data == NULL)
            warning (_("\
 Could not relocate shared library \"%s\": no segments"), so->so_name);
@@ -375,7 +375,7 @@ Could not relocate shared library \"%s\": no segments"), so->so_name);
              ULONGEST orig_delta;
              int i;
 
-             if (!symfile_map_offsets_to_segments (so->abfd, data,
+             if (!symfile_map_offsets_to_segments (so->abfd, data.get (),
                                                    li->offsets,
                                                    li->segment_bases.size (),
                                                    li->segment_bases.data ()))
@@ -407,8 +407,6 @@ Could not relocate shared library \"%s\": bad offsets"), so->so_name);
                               + data->segment_sizes[i - 1]
                               + orig_delta);
              gdb_assert (so->addr_low <= so->addr_high);
-
-             free_symfile_segment_data (data);
            }
        }
     }