From d1dc3ef361e205b30acb6c9eccd102c844ec714a Mon Sep 17 00:00:00 2001 From: Frank Niessen Date: Tue, 10 Jul 2018 14:28:12 +0200 Subject: cleanup code: switch from c-lib memory handling (malloc) to glib based memory handling --- src/remmina_ssh_plugin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c index f15c7a108..228e77da0 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 #include #include #include -- cgit v1.2.3 From 6a178eb4d98de4766242fc8b93c5e4d835fbcc71 Mon Sep 17 00:00:00 2001 From: Frank Niessen Date: Wed, 11 Jul 2018 13:33:41 +0200 Subject: bugfix: set correct number of records for allocating memory --- src/remmina_ssh_plugin.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c index 228e77da0..04dcace17 100644 --- a/src/remmina_ssh_plugin.c +++ b/src/remmina_ssh_plugin.c @@ -1158,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); } @@ -1235,10 +1233,11 @@ remmina_ssh_plugin_register(void) remmina_plugin_service = &remmina_plugin_manager_service; - RemminaProtocolSettingOpt *settings = malloc(sizeof(remmina_ssh_advanced_settings)); + unsigned int rec_size = sizeof(remmina_ssh_advanced_settings) / sizeof(RemminaProtocolSetting); + + RemminaProtocolSettingOpt *settings = g_new(RemminaProtocolSettingOpt, rec_size); // preset new settings with (old) static remmina_ssh_advanced_settings data - unsigned int rec_size = sizeof(remmina_ssh_advanced_settings) / sizeof(RemminaProtocolSetting); for (int ii=0; ii < rec_size; ii++) { settings[ii].type = remmina_ssh_advanced_settings[ii].type; settings[ii].name = remmina_ssh_advanced_settings[ii].name; -- cgit v1.2.3