render-node-tool: Actually load files properly
authorBenjamin Otte <otte@redhat.com>
Wed, 13 Sep 2023 18:35:02 +0000 (20:35 +0200)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 19 Sep 2023 20:32:27 +0000 (16:32 -0400)
tools/gtk-rendernode-tool-utils.c

index 6c47a4ece74de90c30eef3f29221c71b8b972fd7..e91cbc3ea20744c8e4d4dc6b059dcafd21b3e820 100644 (file)
@@ -61,17 +61,15 @@ load_node_file (const char *filename)
   GError *error = NULL;
 
   file = g_file_new_for_commandline_arg (filename);
-  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
+  bytes = g_file_load_bytes (file, NULL, NULL, &error);
   g_object_unref (file);
 
   if (bytes == NULL)
-    return NULL;
-
-  if (!g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
     {
-      g_bytes_unref (bytes);
-      return NULL;
+      g_printerr (_("Failed to load node file: %s\n"), error->message);
+      g_clear_error (&error);
+      exit (1);
     }
 
-  return gsk_render_node_deserialize (bytes, deserialize_error_func, &error);
+  return gsk_render_node_deserialize (bytes, deserialize_error_func, NULL);
 }