PR gdb/24364: Don't call dtrace_process_dof with NULL dof.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51748a80e46a4258cbdc0366a145e37162a428b8..397a08f20b500bb4d739b2760954b7ebb4f3a296 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-17  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       PR gdb/24364
+       * gdb/dtrace-probe.c (dtrace_static_probe_ops::get_probe): Don't
+       call dtrace_process_dof with NULL dof.
+
 2019-06-16  Tom de Vries  <tdevries@suse.de>
 
        PR gdb/24445

diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
index 52973784e9aa2353fd855481683883762c8dfb9f..2a2eae1f709ba53f2448d6bb53074024cbbc75d0 100644 (file)
--- a/gdb/dtrace-probe.c
+++ b/gdb/dtrace-probe.c
@@ -856,13 +856,14 @@ dtrace_static_probe_ops::get_probes
 
          /* 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, &dof))
+         if (bfd_malloc_and_get_section (abfd, sect, &dof) && dof != NULL)
+           dtrace_process_dof (sect, objfile, probesp,
+                               (struct dtrace_dof_hdr *) dof);
+         else
            complaint (_("could not obtain the contents of"
                         "section '%s' in objfile `%s'."),
                       sect->name, abfd->filename);
-      
-         dtrace_process_dof (sect, objfile, probesp,
-                             (struct dtrace_dof_hdr *) dof);
+
          xfree (dof);
        }
     }