From 755e30952c49538ebcffb3d036cdf3f71d89fd60 Mon Sep 17 00:00:00 2001
From: Phil Wyett <philip.wyett@kathenas.org>
Date: Mar 28 2022 15:20:51 +0000
Subject: Bugfix release.


- Add patch: 0001_vnc_close_all_close_git_55e2324a.patch
- Add patch: 0002_rdp_possible_segv_git_3620efda.patch

---

diff --git a/0001_vnc_close_all_close_git_55e2324a.patch b/0001_vnc_close_all_close_git_55e2324a.patch
new file mode 100644
index 0000000..eb46783
--- /dev/null
+++ b/0001_vnc_close_all_close_git_55e2324a.patch
@@ -0,0 +1,38 @@
+diff --git a/src/rcw.c b/src/rcw.c
+index 6f3cb2f18b615185c073fa4fc269804822e1b5df..94cf0d6f87f4ad5c2ffce8083e09ffef030b3c1c 100644
+--- a/src/rcw.c
++++ b/src/rcw.c
+@@ -3398,6 +3398,10 @@ void rco_closewin(RemminaProtocolWidget *gp)
+ 		}
+ 	}
+ 	if (cnnobj) {
++		if (REMMINA_IS_SCROLLED_VIEWPORT(cnnobj->scrolled_container)) {
++			REMMINA_DEBUG("deleting motion");
++			remmina_scrolled_viewport_remove_motion(REMMINA_SCROLLED_VIEWPORT(cnnobj->scrolled_container));
++		}
+ 		cnnobj->remmina_file = NULL;
+ 		g_free(cnnobj);
+ 		gp->cnnobj = NULL;
+diff --git a/src/remmina_scrolled_viewport.c b/src/remmina_scrolled_viewport.c
+index 44056519df2ab2430782183c6f820fe5e184cfd2..f42ec99ec20515974673df4090eb2a8becf368dd 100644
+--- a/src/remmina_scrolled_viewport.c
++++ b/src/remmina_scrolled_viewport.c
+@@ -38,6 +38,7 @@
+ #include "config.h"
+ #include "remmina_scrolled_viewport.h"
+ #include "remmina_pref.h"
++#include "remmina_log.h"
+ #include "remmina/remmina_trace_calls.h"
+ 
+ G_DEFINE_TYPE( RemminaScrolledViewport, remmina_scrolled_viewport, GTK_TYPE_EVENT_BOX)
+@@ -156,6 +157,10 @@ static gboolean remmina_scrolled_viewport_leave(GtkWidget *widget, GdkEventCross
+ {
+ 	TRACE_CALL(__func__);
+ 	RemminaScrolledViewport *gsv = REMMINA_SCROLLED_VIEWPORT(widget);
++        if (gsv->viewport_motion_handler) {
++           REMMINA_DEBUG("cleaning motion ...");
++           remmina_scrolled_viewport_remove_motion(gsv);
++        }
+ 	gsv->viewport_motion_handler = g_timeout_add(20, remmina_scrolled_viewport_motion_timeout, gsv);
+ 	return FALSE;
+ }
diff --git a/0002_rdp_possible_segv_git_3620efda.patch b/0002_rdp_possible_segv_git_3620efda.patch
new file mode 100644
index 0000000..2f759ca
--- /dev/null
+++ b/0002_rdp_possible_segv_git_3620efda.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c
+index 725558cab62f94c64f251ee0770bfa560a614676..a01e4cc683d2788265f02b250cf6cbe6160606dc 100644
+--- a/plugins/rdp/rdp_plugin.c
++++ b/plugins/rdp/rdp_plugin.c
+@@ -530,7 +530,7 @@ BOOL rf_end_paint(rdpContext *context)
+ 	gdi = context->gdi;
+ 	rfi = (rfContext *)context;
+ 
+-	if (gdi == NULL || gdi->primary == NULL || gdi->primary->hdc == NULL)
++	if (gdi == NULL || gdi->primary == NULL || gdi->primary->hdc == NULL || gdi->primary->hdc->hwnd == NULL)
+ 		return TRUE;
+ 
+ 	if (gdi->primary->hdc->hwnd->invalid->null)
diff --git a/remmina.spec b/remmina.spec
index f3e4b09..2973a35 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -2,7 +2,7 @@
 
 Name: remmina
 Version: 1.4.25
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Remote Desktop Client
 License: GPLv2+ and MIT
 URL: https://remmina.org
@@ -20,6 +20,10 @@ ExcludeArch: aarch64
 # So we can't use it directly only as instructions.
 Source1: pluginBuild-CMakeLists.txt
 
+# Patches.
+Patch0: 0001_vnc_close_all_close_git_55e2324a.patch
+Patch1: 0002_rdp_possible_segv_git_3620efda.patch
+
 %if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires: cmake
 %else
@@ -324,6 +328,10 @@ fi
 %{_mandir}/man1/remmina-gnome.1.*
 
 %changelog
+* Mon Mar 28 2022 Phil Wyett <philip.wyett@kathenas.org> - 1.4.25-2
+- Add patch: 0001_vnc_close_all_close_git_55e2324a.patch
+- Add patch: 0002_rdp_possible_segv_git_3620efda.patch
+
 * Fri Mar 11 2022 Phil Wyett <philip.wyett@kathenas.org> - 1.4.25-1
 - New upstream version 1.4.25.