From d0c1a5bc61a3d151f2234aa3820862f16c0f00c7 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Mon, 7 Mar 2016 23:20:31 +0100 Subject: [PATCH] xwin: no need to free auth data if AddResource fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is taken care of by SecurityDeleteAuthorization Reviewed-by: Rémi Cardona Signed-off-by: Julien Cristau --- hw/xwin/winauth.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c index 7efa1c00f..7be7dcae1 100644 --- a/hw/xwin/winauth.c +++ b/hw/xwin/winauth.c @@ -114,7 +114,6 @@ GenerateAuthorization(unsigned name_length, Bool winGenerateAuthorization(void) { - Bool fFreeAuth = FALSE; SecurityAuthorizationPtr pAuth = NULL; /* Call OS layer to generate authorization key */ @@ -123,7 +122,7 @@ winGenerateAuthorization(void) 0, NULL, &g_uiAuthDataLen, &g_pAuthData); if ((XID) ~0L == g_authId) { ErrorF("winGenerateAuthorization - GenerateAuthorization failed\n"); - goto auth_bailout; + return FALSE; } else { @@ -139,7 +138,7 @@ winGenerateAuthorization(void) if (!(pAuth)) { ErrorF("winGenerateAuthorization - Failed allocating " "SecurityAuthorizationPtr.\n"); - goto auth_bailout; + return FALSE; } /* Fill in the auth fields */ @@ -155,21 +154,11 @@ winGenerateAuthorization(void) /* Add the authorization to the server's auth list */ if (!AddResource(g_authId, SecurityAuthorizationResType, pAuth)) { ErrorF("winGenerateAuthorization - AddResource failed for auth.\n"); - fFreeAuth = TRUE; - goto auth_bailout; + return FALSE; } - - /* Don't free the auth data, since it is still used internally */ - pAuth = NULL; #endif return TRUE; - - auth_bailout: - if (fFreeAuth) - free(pAuth); - - return FALSE; } /* Use our generated cookie for authentication */