summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-09-26 01:29:31 -0700
committerStefano Karapetsas <[email protected]>2013-09-26 01:29:31 -0700
commita43a1d9f36f393b64ef965e033757f70c201141c (patch)
treea78356ec3ec409dcee5a3c98938c1d800c463b20 /plugins
parentdfe505522c630863438c3649e2a028f14e1138fa (diff)
parent66585e2be5a1cd936abb27db318deba4bfc4a453 (diff)
downloadpluma-a43a1d9f36f393b64ef965e033757f70c201141c.tar.bz2
pluma-a43a1d9f36f393b64ef965e033757f70c201141c.tar.xz
Merge pull request #29 from kallisti5/master
filemanager: Add assertion checks to prevent dereferencing ptrs
Diffstat (limited to 'plugins')
-rw-r--r--plugins/filebrowser/pluma-file-browser-plugin.c1
-rw-r--r--plugins/filebrowser/pluma-file-browser-store.c2
-rw-r--r--plugins/filebrowser/pluma-file-browser-widget.c2
3 files changed, 5 insertions, 0 deletions
diff --git a/plugins/filebrowser/pluma-file-browser-plugin.c b/plugins/filebrowser/pluma-file-browser-plugin.c
index bce64c69..69b1e185 100644
--- a/plugins/filebrowser/pluma-file-browser-plugin.c
+++ b/plugins/filebrowser/pluma-file-browser-plugin.c
@@ -306,6 +306,7 @@ on_confirm_trash_changed (GSettings *settings,
PlumaFileBrowserPluginData *data;
gboolean enable = FALSE;
+ data = (PlumaFileBrowserPluginData *)(user_data);
enable = g_settings_get_boolean (settings, key);
data->confirm_trash = enable;
diff --git a/plugins/filebrowser/pluma-file-browser-store.c b/plugins/filebrowser/pluma-file-browser-store.c
index 6f611105..ba45feff 100644
--- a/plugins/filebrowser/pluma-file-browser-store.c
+++ b/plugins/filebrowser/pluma-file-browser-store.c
@@ -2480,6 +2480,8 @@ set_virtual_root_from_node (PlumaFileBrowserStore * model,
GSList *copy;
GtkTreePath *empty = NULL;
+ g_assert (node != NULL);
+
prev = node;
next = prev->parent;
diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c
index f2c54fe9..22c3c3b0 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -1640,6 +1640,8 @@ jump_to_location (PlumaFileBrowserWidget * obj, GList * item,
obj->priv->changing_location = TRUE;
+ g_assert (obj->priv->current_location != NULL);
+
loc = (Location *) (obj->priv->current_location->data);
/* Set the new root + virtual root */