From 4781f2a5a8c2c2b000374e2d87982a6701d5a6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fukan=20Korkmazt=C3=BCrk?= Date: Tue, 22 Nov 2022 13:43:16 -0500 Subject: [PATCH] GLX: Free the tag of the old context later MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In CommonMakeCurrent() function, the tag of the old context is freed before the new context is made current. This is problematic because if the CommonMakeNewCurrent() function fails, the tag of the old context ends up being removed, even though it is still active. This causes subsequent glXMakeCurrent() or glXMakeContextCurrent() requests to generate a GLXBadContextTag error. This change moves the function call that frees the old tag to a location where the result of CommonMakeNewCurrent() call is known and it is safe to free it. Signed-off-by: Doğukan Korkmaztürk --- glx/vndcmds.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/glx/vndcmds.c b/glx/vndcmds.c index d6d8719e1..d1e088973 100644 --- a/glx/vndcmds.c +++ b/glx/vndcmds.c @@ -165,9 +165,6 @@ static int CommonLoseCurrent(ClientPtr client, GlxContextTagInfo *tagInfo) tagInfo->tag, // No old context tag, None, None, None, 0); - if (ret == Success) { - GlxFreeContextTag(tagInfo); - } return ret; } @@ -259,7 +256,6 @@ static int CommonMakeCurrent(ClientPtr client, if (ret != Success) { return ret; } - oldTag = NULL; } if (newVendor != NULL) { @@ -270,6 +266,9 @@ static int CommonMakeCurrent(ClientPtr client, } else { reply.contextTag = 0; } + + GlxFreeContextTag(oldTag); + oldTag = NULL; } reply.contextTag = GlxCheckSwap(client, reply.contextTag);