Fix crash when parsing metadata, fixes bug 563390

2008-12-16  Jürg Billeter  <j@bitron.ch>

	* vapigen/valagirparser.vala:

	Fix crash when parsing metadata, fixes bug 563390

svn path=/trunk/; revision=2182

diff --git a/ChangeLog b/ChangeLog
index cb7b3614c717d012855a2adcc0e1c16e7b4af94e..8613325f3504bee37ab48ff833ba2cce5cad7a11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-16  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/valagirparser.vala:
+
+       Fix crash when parsing metadata, fixes bug 563390
+
 2008-12-16  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodemethodcallmodule.vala:

diff --git a/vapigen/valagirparser.vala b/vapigen/valagirparser.vala
index 7d267de88235c73d4e98c82f2ddf2a4fb144c9a0..b6fce7ef7a83ec824c35f74d3e1330adcfdff52e 100644 (file)
--- a/vapigen/valagirparser.vala
+++ b/vapigen/valagirparser.vala
@@ -885,6 +885,10 @@ public class Vala.GirParser : CodeVisitor {
 
                                        foreach (string attribute in tokens[1].split (" ")) {
                                                string[] pair = attribute.split ("=", 2);
+                                               if (pair[0] == null || pair[1] == null) {
+                                                       continue;
+                                               }
+
                                                string key = "%s/@%s".printf (tokens[0], pair[0]);
                                                attributes_map.set (key, pair[1].substring (1, pair[1].length - 2));
                                        }