From a78182c42523489636ae5f2723126a69cccb93de Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Fri, 12 May 2023 13:56:24 +0200
Subject: [PATCH] [client,sdl] unify primary surface cleanup

---
 client/SDL/sdl_freerdp.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/client/SDL/sdl_freerdp.cpp b/client/SDL/sdl_freerdp.cpp
index d2ad9bbe1..d2058f056 100644
--- a/client/SDL/sdl_freerdp.cpp
+++ b/client/SDL/sdl_freerdp.cpp
@@ -412,6 +412,17 @@ static BOOL sdl_end_paint(rdpContext* context)
 	return rc;
 }
 
+static void sdl_destroy_primary(sdlContext* sdl)
+{
+	if (!sdl)
+		return;
+
+	SDL_FreeFormat(sdl->primary_format);
+	SDL_FreeSurface(sdl->primary);
+	sdl->primary = nullptr;
+	sdl->primary_format = nullptr;
+}
+
 /* Create a SDL surface from the GDI buffer */
 static BOOL sdl_create_primary(sdlContext* sdl)
 {
@@ -422,8 +433,7 @@ static BOOL sdl_create_primary(sdlContext* sdl)
 	gdi = sdl->common.context.gdi;
 	WINPR_ASSERT(gdi);
 
-	SDL_FreeFormat(sdl->primary_format);
-	SDL_FreeSurface(sdl->primary);
+	sdl_destroy_primary(sdl);
 	sdl->primary = SDL_CreateRGBSurfaceWithFormatFrom(
 	    gdi->primary_buffer, (int)gdi->width, (int)gdi->height,
 	    (int)FreeRDPGetBitsPerPixel(gdi->dstFormat), (int)gdi->stride, sdl->sdl_pixel_format);
@@ -592,11 +602,8 @@ static void sdl_cleanup_sdl(sdlContext* sdl)
 
 		*window = empty;
 	}
-	SDL_FreeFormat(sdl->primary_format);
-	sdl->primary_format = nullptr;
 
-	SDL_FreeSurface(sdl->primary);
-	sdl->primary = nullptr;
+	sdl_destroy_primary(sdl);
 
 	sdl->windowCount = 0;
 	SDL_Quit();