summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-09-19 15:59:57 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-09-19 15:59:57 +0200
commitaf00a17308fd17ea454021649a36f2f397a6da2b (patch)
tree138098c7986bae71898fa3c4748ae3114ad74dd1 /src
parent034204d3d8d1a32b1a20e50697c5f81db6fb20cf (diff)
downloaduca-af00a17308fd17ea454021649a36f2f397a6da2b.tar.gz
uca-af00a17308fd17ea454021649a36f2f397a6da2b.tar.bz2
uca-af00a17308fd17ea454021649a36f2f397a6da2b.tar.xz
uca-af00a17308fd17ea454021649a36f2f397a6da2b.zip
Fix segfault
Diffstat (limited to 'src')
-rw-r--r--src/uca-plugin-manager.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/uca-plugin-manager.c b/src/uca-plugin-manager.c
index 7788678..bb27215 100644
--- a/src/uca-plugin-manager.c
+++ b/src/uca-plugin-manager.c
@@ -86,7 +86,9 @@ get_camera_names_from_directory (const gchar *path)
if (g_match_info_matches (match_info)) {
gchar *word = g_match_info_fetch (match_info, 1);
- result = g_list_append (result, word);
+
+ if (word != NULL)
+ result = g_list_append (result, word);
}
name = g_dir_read_name (dir);
@@ -100,7 +102,7 @@ GList *
uca_plugin_manager_get_available_cameras (UcaPluginManager *manager)
{
UcaPluginManagerPrivate *priv;
- GList *camera_names;
+ GList *camera_names = NULL;
g_return_val_if_fail (UCA_IS_PLUGIN_MANAGER (manager), NULL);