[sysprof] libsysprof: protect against bad reads

[Christian Hergert <chergert src gnome org>]

commit 3e7acd5663e1594ca3d0dbf110122e73cc87323b
Author: Christian Hergert <chergert redhat com>
Date:   Thu Feb 13 14:28:03 2020 -0800

    libsysprof: protect against bad reads

 src/libsysprof/sysprof-symbol-map.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/src/libsysprof/sysprof-symbol-map.c b/src/libsysprof/sysprof-symbol-map.c
index 15cdf18..1d52f5c 100644
--- a/src/libsysprof/sysprof-symbol-map.c
+++ b/src/libsysprof/sysprof-symbol-map.c
@@ -232,7 +232,7 @@ sysprof_symbol_map_add_resolver (SysprofSymbolMap      *self,
   g_ptr_array_add (self->resolvers, g_object_ref (resolver));
 }
 
-static void
+static gboolean
 sysprof_symbol_map_do_alloc (SysprofSymbolMap     *self,
                              SysprofCaptureReader *reader,
                              GHashTable           *seen)
@@ -244,7 +244,7 @@ sysprof_symbol_map_do_alloc (SysprofSymbolMap     *self,
   g_assert (seen != NULL);
 
   if (!(ev = sysprof_capture_reader_read_allocation (reader)))
-    return;
+    return FALSE;
 
   for (guint i = 0; i < ev->n_addrs; i++)
     {
@@ -283,9 +283,11 @@ sysprof_symbol_map_do_alloc (SysprofSymbolMap     *self,
             }
         }
     }
+
+  return TRUE;
 }
 
-static void
+static gboolean
 sysprof_symbol_map_do_sample (SysprofSymbolMap        *self,
                               SysprofCaptureReader    *reader,
                               GHashTable              *seen)
@@ -298,7 +300,7 @@ sysprof_symbol_map_do_sample (SysprofSymbolMap        *self,
   g_assert (seen != NULL);
 
   if (!(sample = sysprof_capture_reader_read_sample (reader)))
-    return;
+    return FALSE;
 
   for (guint i = 0; i < sample->n_addrs; i++)
     {
@@ -344,6 +346,8 @@ sysprof_symbol_map_do_sample (SysprofSymbolMap        *self,
             }
         }
     }
+
+  return TRUE;
 }
 
 void
@@ -373,12 +377,14 @@ sysprof_symbol_map_resolve (SysprofSymbolMap     *self,
     {
       if (type == SYSPROF_CAPTURE_FRAME_SAMPLE)
         {
-          sysprof_symbol_map_do_sample (self, reader, seen);
+          if (!sysprof_symbol_map_do_sample (self, reader, seen))
+            break;
           continue;
         }
       else if (type == SYSPROF_CAPTURE_FRAME_ALLOCATION)
         {
-          sysprof_symbol_map_do_alloc (self, reader, seen);
+          if (!sysprof_symbol_map_do_alloc (self, reader, seen))
+            break;
           continue;
         }