From: Benjamin Otte <otte@redhat.com>
Date: Wed, 13 Sep 2023 18:35:02 +0000 (+0200)
Subject: render-node-tool: Actually load files properly
X-Git-Tag: archive/raspbian/4.12.4+ds-3+rpi1^2~21^2~2^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e711c92196083f4502a916de7fa516a694ba0b36;p=gtk4.git

render-node-tool: Actually load files properly
---

diff --git a/tools/gtk-rendernode-tool-utils.c b/tools/gtk-rendernode-tool-utils.c
index 6c47a4ece7..e91cbc3ea2 100644
--- a/tools/gtk-rendernode-tool-utils.c
+++ b/tools/gtk-rendernode-tool-utils.c
@@ -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);
 }