From adc4f2abf8d728bcaf81869631b4e1bad1c3e21a Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 12 Sep 2024 10:41:40 +0200
Subject: [PATCH] [warnings] fix unused variables

---
 libfreerdp/gdi/test/TestGdiRop3.c             | 6 ++++--
 server/shadow/shadow_client.c                 | 3 ++-
 winpr/libwinpr/crt/string.c                   | 6 +++++-
 winpr/libwinpr/utils/collections/StreamPool.c | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/libfreerdp/gdi/test/TestGdiRop3.c b/libfreerdp/gdi/test/TestGdiRop3.c
index a024053c8..50b8e1819 100644
--- a/libfreerdp/gdi/test/TestGdiRop3.c
+++ b/libfreerdp/gdi/test/TestGdiRop3.c
@@ -118,6 +118,9 @@ static char* gdi_convert_postfix_to_infix(const char* postfix)
 		}
 		else
 		{
+			char* a = NULL;
+			char* b = NULL;
+
 			/* token is an operator */
 			unary = FALSE;
 			char* c = malloc(2);
@@ -149,11 +152,10 @@ static char* gdi_convert_postfix_to_infix(const char* postfix)
 			}
 
 			// printf("Operator: %s\n", c);
-			char* a = (char*)Stack_Pop(stack);
+			a = (char*)Stack_Pop(stack);
 			if (!a)
 				goto fail;
 
-			char* b = NULL;
 			if (!unary)
 				b = (char*)Stack_Pop(stack);
 
diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c
index 1ce4a762f..20d88806c 100644
--- a/server/shadow/shadow_client.c
+++ b/server/shadow/shadow_client.c
@@ -513,7 +513,8 @@ static BOOL shadow_client_post_connect(freerdp_peer* peer)
 		BOOL rc = freerdp_settings_set_bool(
 		    settings, FreeRDP_NSCodec,
 		    FALSE); /* NSCodec compressor does not support fragmentation yet */
-		WINPR_ASSERT(rc);
+		if (!rc)
+			return FALSE;
 	}
 
 	WLog_INFO(TAG, "Client from %s is activated (%" PRIu32 "x%" PRIu32 "@%" PRIu32 ")",
diff --git a/winpr/libwinpr/crt/string.c b/winpr/libwinpr/crt/string.c
index 4f93a37dc..22b3feece 100644
--- a/winpr/libwinpr/crt/string.c
+++ b/winpr/libwinpr/crt/string.c
@@ -207,7 +207,11 @@ int winpr_vasprintf(char** s, size_t* slen, WINPR_FORMAT_ARG const char* templ,
 	const int plen = vsprintf(str, templ, ap);
 	va_end(ap);
 
-	WINPR_ASSERT(length == plen);
+	if (length != plen)
+	{
+		free(str);
+		return -1;
+	}
 	*s = str;
 	*slen = (size_t)length;
 	return length;
diff --git a/winpr/libwinpr/utils/collections/StreamPool.c b/winpr/libwinpr/utils/collections/StreamPool.c
index b278a789a..93830939b 100644
--- a/winpr/libwinpr/utils/collections/StreamPool.c
+++ b/winpr/libwinpr/utils/collections/StreamPool.c
@@ -243,8 +243,8 @@ static void StreamPool_Remove(wStreamPool* pool, wStream* s)
 	for (size_t x = 0; x < pool->aSize; x++)
 	{
 		wStream* cs = pool->aArray[x];
-
-		WINPR_ASSERT(cs != s);
+		if (cs == s)
+			return;
 	}
 	pool->aArray[(pool->aSize)++] = s;
 	StreamPool_RemoveUsed(pool, s);