From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 15 Apr 2014 18:10:39 +0000 (-0400)
Subject: gdesktopappinfo: fix a crasher
X-Git-Tag: 2.41.1~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afaee8dc6ad72281dd1a51ebae58aaabf0efdb05;p=platform%2Fupstream%2Fglib.git

gdesktopappinfo: fix a crasher

During the time that we are expanding the strv, it is not
null-terminated.  Use the strv_len variable instead to bound the search
for duplicates.
---

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 8d1bc69..0b72803 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -663,7 +663,7 @@ expand_strv (gchar         ***strv_ptr,
             goto no_add;
 
       /* Don't add duplicates already in the list */
-      for (j = 0; strv[j]; j++)
+      for (j = 0; j < strv_len; j++)
         if (g_str_equal (to_add[i], strv[j]))
           goto no_add;