[gnome-builder] makecache: ensure trailing NULL in strv for vala build flags



commit fed3631b486689cb240e14b49abfdda1c8cc9571
Author: Christian Hergert <christian hergert me>
Date:   Wed Apr 20 16:06:46 2016 -0700

    makecache: ensure trailing NULL in strv for vala build flags
    
    Missed the trailing NULL for the strv when writing the vala parsing code.
    Fixes crashes when loading some vala projects.

 plugins/autotools/ide-makecache.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/plugins/autotools/ide-makecache.c b/plugins/autotools/ide-makecache.c
index 2e24597..7c1eeb1 100644
--- a/plugins/autotools/ide-makecache.c
+++ b/plugins/autotools/ide-makecache.c
@@ -838,8 +838,6 @@ ide_makecache_parse_valac (IdeMakecache *self,
   g_auto(GStrv) argv = NULL;
   gint argc = 0;
 
-  IDE_ENTRY;
-
   g_assert (IDE_IS_MAKECACHE (self));
   g_assert (line != NULL);
   g_assert (relpath != NULL);
@@ -899,7 +897,7 @@ ide_makecache_parse_valac (IdeMakecache *self,
         }
     }
 
-  IDE_EXIT;
+  g_ptr_array_add (ret, NULL);
 }
 
 static gchar **
@@ -908,7 +906,7 @@ ide_makecache_parse_line (IdeMakecache *self,
                           const gchar  *relpath,
                           const gchar  *subdir)
 {
-  GPtrArray *ret = NULL;
+  GPtrArray *ret;
   const gchar *pos;
 
   IDE_ENTRY;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]