Merge branch 'builder-tool-fixes' into 'main'

buildertool: Fix a possible crash

See merge request GNOME/gtk!4246

1 files changed, 8 insertions, 2 deletions

diff --git a/tools/gtk-builder-tool-simplify.c b/tools/gtk-builder-tool-simplify.c
index dfa4eb7097..bb8e1ebd62 100644
--- a/tools/gtk-builder-tool-simplify.c
+++ b/tools/gtk-builder-tool-simplify.c
@@ -486,7 +486,7 @@ get_attribute_value (Element *element,
         return element->attribute_values[i];
     }
 
-  return NULL;
+  return "";
 }
 
 static void
@@ -549,7 +549,7 @@ get_class_name (Element *element)
         return get_attribute_value (parent, "class");
     }
 
-  return NULL;
+  return "";
 }
 
 static gboolean
@@ -2295,6 +2295,12 @@ simplify_file (const char *filename,
       return FALSE;
     }
 
+  if (!g_markup_parse_context_end_parse (context, &error))
+    {
+      g_printerr (_("Can't parse “%s”: %s\n"), filename, error->message);
+      return FALSE;
+    }
+
   data.builder = gtk_builder_new ();
 
   if (data.convert3to4)