From ffdf88ecd798f111b18060e6394b040a1accf7fb Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Thu, 19 Feb 2015 14:42:37 -0800 Subject: [PATCH] 2015-02-19 Steve Ellcey * dtrace-probe.c (dtrace_process_dof_probe): Initialize arg.expr. (dtrace_get_probes) Change type of variable 'dof'. --- gdb/ChangeLog | 5 +++++ gdb/dtrace-probe.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 303bb96..07c7c50 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-02-19 Steve Ellcey + + * dtrace-probe.c (dtrace_process_dof_probe): Initialize arg.expr. + (dtrace_get_probes) Change type of variable 'dof'. + 2015-02-19 Antoine Tremblay PR breakpoints/16812 diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c index a6544ba..b244449 100644 --- a/gdb/dtrace-probe.c +++ b/gdb/dtrace-probe.c @@ -415,6 +415,9 @@ dtrace_process_dof_probe (struct objfile *objfile, struct dtrace_probe_arg arg; struct expression *expr; + /* Set arg.expr to ensure all fields in expr are initialized and + the compiler will not warn when arg is used. */ + arg.expr = NULL; arg.type_str = xstrdup (p); /* Use strtab_size as a sentinel. */ @@ -617,17 +620,18 @@ dtrace_get_probes (VEC (probe_p) **probesp, struct objfile *objfile) { if (elf_section_data (sect)->this_hdr.sh_type == SHT_SUNW_dof) { - struct dtrace_dof_hdr *dof; + bfd_byte *dof; /* Read the contents of the DOF section and then process it to extract the information of any probe defined into it. */ - if (!bfd_malloc_and_get_section (abfd, sect, (bfd_byte **) &dof)) + if (!bfd_malloc_and_get_section (abfd, sect, &dof)) complaint (&symfile_complaints, _("could not obtain the contents of" "section '%s' in objfile `%s'."), sect->name, abfd->filename); - dtrace_process_dof (sect, objfile, probesp, dof); + dtrace_process_dof (sect, objfile, probesp, + (struct dtrace_dof_hdr *) dof); xfree (dof); } } -- 2.7.4