cleanup code: switch from c-lib memory handling (malloc) to glib based memory handling

1 files changed, 7 insertions, 12 deletions

diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c
index f15c7a108..9d0e0b5e8 100644
--- a/src/remmina_ssh_plugin.c
+++ b/src/remmina_ssh_plugin.c
@@ -40,7 +40,6 @@
 
 #if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE)
 
-#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -1159,10 +1158,8 @@ remmina_ssh_plugin_load_terminal_palettes(gpointer *ssh_terminal_palette_new)
 				while ((filename = g_dir_read_name(system_data_dir))) {
 					if (!g_file_test(filename, G_FILE_TEST_IS_DIR)) {
 						if (g_str_has_suffix(filename, ".colors")) {
-							gchar *menu_str = malloc(strlen(filename) + 1);
-							strcpy(menu_str, filename);
-							char *t2 = strrchr(menu_str, '.');
-							t2[0] = 0;
+							gsize len = strrchr(filename, '.') - filename;
+							gchar *menu_str = g_strndup(filename, len);
 							if (g_list_find_custom(files, menu_str,compare) == NULL) {
 								files = g_list_insert_sorted(files, menu_str, compare);
 							}
@@ -1187,11 +1184,9 @@ remmina_ssh_plugin_load_terminal_palettes(gpointer *ssh_terminal_palette_new)
 			while ((filename = g_dir_read_name(user_data_dir))) {
 				if (!g_file_test(filename, G_FILE_TEST_IS_DIR)) {
 					if (g_str_has_suffix(filename, ".colors")) {
-						char *menu_str = malloc(strlen(filename) + 1);
-						strcpy(menu_str, filename);
-						char *t2 = strrchr(menu_str, '.');
-						t2[0] = 0;
-						if (g_list_find_custom(files, menu_str, compare) == NULL) {
+						gsize len = strrchr(filename, '.') - filename;
+						gchar *menu_str = g_strndup(filename, len);
+						if (g_list_find_custom(files, menu_str,compare) == NULL) {
 							files = g_list_insert_sorted(files, menu_str, compare);
 						}
 					}
@@ -1202,7 +1197,7 @@ remmina_ssh_plugin_load_terminal_palettes(gpointer *ssh_terminal_palette_new)
 
 	rec_size = g_list_length(files) * 2;
 
-	gpointer *color_palette = malloc((preset_rec_size + rec_size) * sizeof(gpointer));
+	gpointer *color_palette = g_new(gpointer, preset_rec_size + rec_size);
 
 	unsigned int field_idx = 0;
 	*ssh_terminal_palette_new = color_palette;
@@ -1236,7 +1231,7 @@ remmina_ssh_plugin_register(void)
 
 	remmina_plugin_service = &remmina_plugin_manager_service;
 
-	RemminaProtocolSettingOpt *settings = malloc(sizeof(remmina_ssh_advanced_settings));
+	RemminaProtocolSettingOpt *settings = g_new(RemminaProtocolSettingOpt, 1);
 
 	// preset new settings with (old) static remmina_ssh_advanced_settings data
 	unsigned int rec_size = sizeof(remmina_ssh_advanced_settings) / sizeof(RemminaProtocolSetting);