--- desktop-file-utils-0.10.orig/src/eggdesktopentries.c
+++ desktop-file-utils-0.10/src/eggdesktopentries.c
@@ -1441,6 +1441,9 @@
 
   last_char_index = strlen (value) - 1;
 
+  if (last_char_index < 0)
+    last_char_index = 0;
+
   if (value[last_char_index] == ';')
     value[last_char_index] = '\0';
 
@@ -2784,7 +2787,7 @@
       p++;
     }
 
-  if (p[-1] == '\\' && error == NULL)
+  if (p > q && p[-1] == '\\' && error == NULL)
     {
       g_set_error (error, EGG_DESKTOP_ENTRIES_ERROR,
                    EGG_DESKTOP_ENTRIES_ERROR_INVALID_VALUE,
only in patch2:
unchanged:
--- desktop-file-utils-0.10.orig/src/update-desktop-database.c
+++ desktop-file-utils-0.10/src/update-desktop-database.c
@@ -449,6 +449,8 @@
   for (i = 0; data_dirs[i] != NULL; i++)
     args[i] = g_build_filename (data_dirs[i], "applications", NULL);
 
+  args[i] = NULL;
+
   g_strfreev (data_dirs);
 
   return (const char **) args;