Merge lp:~jeremywootten/pantheon-files/fix-crash-on-restore-tabs into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

More carefully validate URIs when restoring tabs

This branch includes some extra checks on uris retrieved from settings during restore tabs.
The uris must be valid and correspond to existing directories.
I have not been able to reproduce the bug but this should reduce the likelihood of it occuring.

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2014-08-03 14:05:45 +0000
+++ src/View/ViewContainer.vala	2014-10-15 12:45:45 +0000
@@ -355,7 +355,7 @@
             dir.cancel ();
             dir.need_reload.disconnect (reload);
             dir.remove_dir_from_cache ();
-            change_view (view_mode, null);
+            dir.load ();
         }
 
         public void update_location_state (bool save_history) {

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2014-08-01 20:20:07 +0000
+++ src/View/Window.vala	2014-10-15 12:45:45 +0000
@@ -521,7 +521,15 @@
                 if (viewmode < 0 || viewmode > 2 || root_uri == null || root_uri == "" || tip_uri == null)
                     continue;
 
-                GLib.File root_location = GLib.File.new_for_uri (GLib.Uri.unescape_string (root_uri));
+                string? unescaped_root_uri = GLib.Uri.unescape_string (root_uri);
+                if (unescaped_root_uri == null) {
+                    warning ("Invalid root location for tab");
+                    continue;
+                }
+
+                GLib.File root_location = GLib.File.new_for_uri (unescaped_root_uri);
+                if (!valid_location (root_location))
+                    continue;
 
                 add_tab (root_location, viewmode);
 
@@ -542,9 +550,14 @@
                 change_tab (active_tab_position);
             }
 
-            string path = current_tab.get_tip_uri ();
-            if (path == "")
-                path = current_tab.get_root_uri ();
+            string path;
+            if (current_tab == null)
+                path = "";
+            else {
+                path = current_tab.get_tip_uri ();
+                if (path == "")
+                    path = current_tab.get_root_uri ();
+            }
 
             /* Render the final path in the location bar without animation */
             top_menu.location_bar.bread.animation_visible = false;
@@ -554,11 +567,35 @@
             return tabs_added;
         }
 
+        private bool valid_location (GLib.File location) {
+            GLib.FileInfo? info = null;
+            try {
+                info = location.query_info ("standard::*", GLib.FileQueryInfoFlags.NONE);
+            }
+            catch (GLib.Error e) {
+                warning ("Invalid location on restoring tabs");
+                return false;
+            }
+
+            if (info.get_file_type () == GLib.FileType.DIRECTORY)
+                return true;
+            else {
+                warning ("Attempt to restore a location that is not a directory");
+                return false;
+            }
+        }
+
         private void expand_miller_view (string tip_uri, GLib.File root_location) {
             var tab = tabs.current;
             var view = tab.page as ViewContainer;
             var mwcols = view.mwcol;
-            var unescaped_tip_uri = GLib.Uri.unescape_string (tip_uri);
+            string? unescaped_tip_uri = GLib.Uri.unescape_string (tip_uri);
+
+            if (unescaped_tip_uri == null) {
+                warning ("Invalid tip uri for Miller View");
+                return;
+            }
+
             var tip_location = GLib.File.new_for_uri (unescaped_tip_uri);
             var relative_path = root_location.get_relative_path (tip_location);
             var slot = mwcols.active_slot;
@@ -573,6 +610,9 @@
                 foreach (string dir in dirs) {
                     uri += (GLib.Path.DIR_SEPARATOR_S + dir);
                     gfile = GLib.File.new_for_uri (uri);
+                    if (!valid_location (gfile))
+                        break;
+
                     dview = slot.view_box as FM.Directory.View;
 
                     dview.column_add_location (gfile);