[gtk/fix-memleaks: 5/11] bookmarklist: Avoid an invalid read




commit 97a9e23b85d2a820d17af06dce2cc49c97b3779e
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Mar 27 16:48:30 2021 -0400

    bookmarklist: Avoid an invalid read
    
    This shows up when running the objects-finalize
    test under valgrind.

 gtk/gtkbookmarklist.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkbookmarklist.c b/gtk/gtkbookmarklist.c
index 6afe1b46f4..6df9d5fa86 100644
--- a/gtk/gtkbookmarklist.c
+++ b/gtk/gtkbookmarklist.c
@@ -287,8 +287,15 @@ got_file_info (GObject      *source,
   GtkBookmarkList *self = user_data;
   GFile *file = G_FILE (source);
   GFileInfo *info;
+  GError *error = NULL;
+
+  info = g_file_query_info_finish (file, res, &error);
+  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+    {
+      g_error_free (error);
+      return;
+    }
 
-  info = g_file_query_info_finish (file, res, NULL);
   if (info)
     {
       char *uri;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]