Fix mem leaks and uninitialized var

Author: giox069

remmina/src/remmina_stats.c

@@ -253,34 +253,28 @@ JsonNode *remmina_stats_get_os_info()
 	kernel_name = g_strdup_printf("%s", remmina_utils_get_kernel_name());
 	if (!kernel_name || kernel_name[0] == '\0') {
 		g_free(kernel_name);
-		kernel_name = "n/a";
+		kernel_name = g_strdup("n/a");
 	}
 	json_builder_add_string_value(b, kernel_name);
-	if (!kernel_name || kernel_name[0] == '\0') {
-		g_free(kernel_name);
-	}
+	g_free(kernel_name);
 
 	json_builder_set_member_name(b, "kernel_release");
 	kernel_release = g_strdup_printf("%s", remmina_utils_get_kernel_release());
 	if (!kernel_release || kernel_release[0] == '\0') {
 		g_free(kernel_release);
-		kernel_release = "n/a";
+		kernel_release = g_strdup("n/a");
 	}
 	json_builder_add_string_value(b, kernel_release);
-	if (!kernel_release || kernel_release[0] == '\0') {
-		g_free(kernel_release);
-	}
+	g_free(kernel_release);
 
 	json_builder_set_member_name(b, "kernel_arch");
 	kernel_arch = g_strdup_printf("%s", remmina_utils_get_kernel_arch());
 	if (!kernel_arch || kernel_arch[0] == '\0') {
 		g_free(kernel_arch);
-		kernel_arch = "n/a";
+		kernel_arch = g_strdup("n/a");
 	}
 	json_builder_add_string_value(b, kernel_arch);
-	if (!kernel_arch || kernel_arch[0] == '\0') {
-		g_free(kernel_arch);
-	}
+	g_free(kernel_arch);
 
 	id = remmina_utils_get_lsb_id();
 	if (!id || id[0] == '\0') {
@@ -294,6 +288,7 @@ JsonNode *remmina_stats_get_os_info()
 	description = remmina_utils_get_lsb_description();
 	if (!description || description[0] == '\0') {
 		g_free(description);
+		description = g_strdup("n/a");
 	}
 	json_builder_set_member_name(b, "lsb_distro_description");
 	json_builder_add_string_value(b, description);
@@ -319,7 +314,7 @@ JsonNode *remmina_stats_get_os_info()
 
 	etc_release = remmina_utils_get_etc_release();
 	if (!etc_release || etc_release[0] == '\0') {
-		g_free(description);
+		g_free(etc_release);
 		etc_release = g_strdup("n/a");
 	}
 	json_builder_set_member_name(b, "etc_release");
@@ -538,7 +533,7 @@ static void remmina_profiles_get_data(RemminaFile *remminafile, gpointer user_da
 	pdata->protocol = remmina_file_get_string(remminafile, "protocol");
 	pdata->pdatestr = remmina_file_get_string(remminafile, "last_success");
 
-	dd = NULL;
+	ds = dd = NULL;
 	if (pdata->pdatestr && pdata->pdatestr[0] != '\0' && strlen(pdata->pdatestr) >= 6) {
 		dyear = g_strdup_printf("%.4s", pdata->pdatestr);
 		dmonth = g_strdup_printf("%.2s", pdata->pdatestr + 4);

remmina/src/remmina_stats_sender.c

@@ -193,10 +193,10 @@ static gboolean remmina_stats_collector_done(gpointer data)
 
 	g = json_generator_new();
 	json_generator_set_root(g, n);
+	json_node_unref(n);
 	unenc_s = json_generator_to_data(g, NULL);	// unenc_s=serialized stats
 	remmina_log_printf("STATS upload: JSON data%s\n", unenc_s);
 	g_object_unref(g);
-	json_node_unref(n);
 
 	/* Now encrypt "s" with remminastats public key */
 
@@ -245,8 +245,6 @@ static gboolean remmina_stats_collector_done(gpointer data)
 		json_generator_set_root(g, n);
 		enc_s = json_generator_to_data(g, NULL);	// unenc_s=serialized stats
 		g_object_unref(g);
-		json_node_unref(n);
-
 
 		ss = soup_session_new();
 		msg = soup_message_new("POST", PERIODIC_UPLOAD_URL);
@@ -257,6 +255,7 @@ static gboolean remmina_stats_collector_done(gpointer data)
 		remmina_log_printf("STATS upload: Starting upload to url %s\n", PERIODIC_UPLOAD_URL);
 	}
 
+	json_node_unref(n);
 	g_free(data);
 
 	return G_SOURCE_REMOVE;
@@ -291,7 +290,6 @@ void remmina_stats_sender_send(gboolean show_only)
 
 	g_thread_new("stats_collector", remmina_stats_collector, (gpointer)sctdata);
 
-
 }
 
 gboolean remmina_stat_sender_can_send()

remmina/src/remmina_utils.c

@@ -243,10 +243,10 @@ gchar *remmina_utils_string_strip(const gchar *s)
  * @param filename The file path of a Linux distribution release file.
  * @param distroSize The size of the distribition name.
  * @param distro The full distro name.
- * @return Returns distro information verbatium from /etc/xxx-release (distro).
+ * @return Returns a string containing distro information verbatium from /etc/xxx-release (distro). Use g_free to free the string.
  *
  */
-const gchar* remmina_utils_read_distrofile(gchar *filename)
+static gchar* remmina_utils_read_distrofile(gchar *filename)
 {
 	TRACE_CALL(__func__);
 	gsize file_sz;
@@ -390,19 +390,20 @@ gchar* remmina_utils_get_etc_release()
 {
 	TRACE_CALL(__func__);
 	gchar *distro_desc = NULL;
+	gchar *s;
 	gint i;
 
 	for (i = 0; distroArray[i].filename != NULL; i++) {
 		g_debug("%s: File %s\n", __func__, distroArray[i].filename);
-		distro_desc = g_strdup(remmina_utils_read_distrofile(
-				distroArray[i].filename));
-
+		distro_desc = remmina_utils_read_distrofile(distroArray[i].filename);
 		if (distro_desc && distro_desc[0] != '\0') {
 			g_debug("%s: Distro description %s\n", __func__, distro_desc);
 			break;
 		}
 	}
-	return remmina_utils_string_strip(distro_desc);
+	s = remmina_utils_string_strip(distro_desc);
+	g_free(distro_desc);
+	return s;
 }
 
 /**