summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-09-26 12:59:26 -0700
committerStefano Karapetsas <[email protected]>2013-09-26 12:59:26 -0700
commit9c93369a4aeab033544ed9357c259989973df8d0 (patch)
tree07f87a11f41ae27e55441cf7150f8815b2d0d712
parentd782c92db5254e7eca56fdbaedb635717bd5878c (diff)
parent2ccb3362b8895a8d8f5f2011d5187e4782dba088 (diff)
downloadengrampa-9c93369a4aeab033544ed9357c259989973df8d0.tar.bz2
engrampa-9c93369a4aeab033544ed9357c259989973df8d0.tar.xz
Merge pull request #25 from kallisti5/master
fr-window: Assertion check to prevent ptr dereference
-rw-r--r--ChangeLog0
-rw-r--r--src/fr-window.c2
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/src/fr-window.c b/src/fr-window.c
index 0b36aea..d986b9c 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -8005,6 +8005,8 @@ fr_window_open_files_with_application (FrWindow *window,
if (window->priv->activity_ref > 0)
return;
+ g_assert (file_list != NULL);
+
for (scan = file_list; scan; scan = scan->next)
uris = g_list_prepend (uris, g_filename_to_uri (scan->data, NULL, NULL));