Merge pull request #1503 from FreeRDP/antenore-patch-1

antenore · web-flow · commit e3f5bd82d8b6 · 2018-03-06T23:27:30.000+01:00
Fixes segmentation fault reported by #1499
diff --git a/remmina/src/remmina_sysinfo.c b/remmina/src/remmina_sysinfo.c
@@ -137,7 +137,7 @@ gchar *remmina_sysinfo_get_wm_name()
 
 	if (!xdg_current_desktop || xdg_current_desktop[0] == '\0') {
 		if (!gdmsession || gdmsession[0] == '\0') {
-			ret = "\0";
+			ret = NULL;
 		}else {
 			ret = g_strdup_printf("%s", gdmsession);
 		}

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ gchar *remmina_sysinfo_get_wm_name()`
`137`	`137`
`138`	`138`	`if (!xdg_current_desktop \|\| xdg_current_desktop[0] == '\0') {`
`139`	`139`	`if (!gdmsession \|\| gdmsession[0] == '\0') {`
`140`		`- ret = "\0";`
	`140`	`+ ret = NULL;`
`141`	`141`	`}else {`
`142`	`142`	`ret = g_strdup_printf("%s", gdmsession);`
`143`	`143`	`}`