From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 20 Sep 2018 08:57:43 +0000 (+0200)
Subject: g-i: Fix use after free in scanner
X-Git-Tag: 0.43.1~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cb5e13279ef649b443f763567ababb669d52a31;p=thirdparty%2Fvala.git

g-i: Fix use after free in scanner

Fixes https://gitlab.gnome.org/GNOME/vala/issues/674
---

diff --git a/gobject-introspection/scannerparser.y b/gobject-introspection/scannerparser.y
index 47a97b601..2042bdc56 100644
--- a/gobject-introspection/scannerparser.y
+++ b/gobject-introspection/scannerparser.y
@@ -54,10 +54,10 @@ csymbol_new (CSymbolType type)
 static void
 ctype_free (CType * type)
 {
-  g_free (type);
   g_free (type->name);
   g_list_foreach (type->child_list, (GFunc)ctype_free, NULL);
   g_list_free (type->child_list);
+  g_free (type);
 }
 
 void
@@ -66,9 +66,9 @@ csymbol_free (CSymbol * symbol)
   g_free (symbol->ident);
   ctype_free (symbol->base_type);
   g_free (symbol->const_string);
-  g_free (symbol);
   g_slist_foreach (symbol->directives, (GFunc)cdirective_free, NULL);
   g_slist_free (symbol->directives);
+  g_free (symbol);
 }
  
 gboolean