Fix a crash when secret plugin is missing

giox069 · giox069 · commit cb13c9818055 · 2018-04-04T23:45:18.000+02:00
diff --git a/remmina/src/remmina_file.c b/remmina/src/remmina_file.c
@@ -239,7 +239,7 @@ remmina_file_load(const gchar *filename)
 		}
 
 		secret_plugin = remmina_plugin_manager_get_secret_plugin();
-		secret_service_available = secret_plugin->is_service_available();
+		secret_service_available = secret_plugin && secret_plugin->is_service_available();
 
 		remminafile->filename = g_strdup(filename);
 		keys = g_key_file_get_keys(gkeyfile, "remmina", NULL, NULL);
@@ -433,7 +433,7 @@ void remmina_file_save(RemminaFile *remminafile)
 	}
 
 	secret_plugin = remmina_plugin_manager_get_secret_plugin();
-	secret_service_available = secret_plugin->is_service_available();
+	secret_service_available = secret_plugin && secret_plugin->is_service_available();
 
 	g_hash_table_iter_init(&iter, remminafile->settings);
 	while (g_hash_table_iter_next(&iter, (gpointer*)&key, (gpointer*)&value)) {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ remmina_file_load(const gchar *filename)`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`secret_plugin = remmina_plugin_manager_get_secret_plugin();`
`242`		`- secret_service_available = secret_plugin->is_service_available();`
	`242`	`+ secret_service_available = secret_plugin && secret_plugin->is_service_available();`
`243`	`243`
`244`	`244`	`remminafile->filename = g_strdup(filename);`
`245`	`245`	`keys = g_key_file_get_keys(gkeyfile, "remmina", NULL, NULL);`
`@@ -433,7 +433,7 @@ void remmina_file_save(RemminaFile *remminafile)`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`secret_plugin = remmina_plugin_manager_get_secret_plugin();`
`436`		`- secret_service_available = secret_plugin->is_service_available();`
	`436`	`+ secret_service_available = secret_plugin && secret_plugin->is_service_available();`
`437`	`437`
`438`	`438`	`g_hash_table_iter_init(&iter, remminafile->settings);`
`439`	`439`	`while (g_hash_table_iter_next(&iter, (gpointer)&key, (gpointer)&value)) {`