Merge lp:~niclasl/pantheon-files/fix-1252928 into lp:~elementary-apps/pantheon-files/trunk

[Niclas Lockner]

Fix a use-after-free that is a potential cause of a segfault (bug #1252928).

Fix a use-after-free that is a potential cause of a segfault in the related bug

[lp:~niclasl/pantheon-files/fix-1252928]

1407. By Niclas Lockner on 2014-01-11

Fix use-after-free

[David Gomes (davidgomes)]

review: Approve

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2013-12-03 20:38:05 +0000
+++ src/fm-directory-view.c	2014-01-11 05:05:18 +0000
@@ -1872,14 +1872,15 @@
     const char *id1, *id2;
 
     id2 = g_app_info_get_id (default_app);
-    for (l=apps; l != NULL; l=l->next) {
+    for (l = apps; l != NULL; l = l->next) {
         app = (GAppInfo *) l->data;
         id1 = g_app_info_get_id (app);
         if (id1 != NULL && id2 != NULL
             && strcmp (id1, id2) == 0)
         {
-			g_object_unref (app);
+            g_object_unref (app);
             apps = g_list_delete_link (apps, l);
+            break;
         }
     }
 
@@ -1900,6 +1901,7 @@
         if (executable != NULL && strcmp (executable, APP_NAME) == 0) {
             g_object_unref (app);
             apps = g_list_delete_link (apps, l);
+            break;
         }
     }