From 9567fa9a7269765bc59ac71b931e16df261d794d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 10 Feb 2013 10:24:59 -0800 Subject: [PATCH] __glXDRIscreenCreateContext: free context on failure, instead of leaking it Reported with other leaks found by cppcheck in bugzilla #50281 https://bugs.freedesktop.org/show_bug.cgi?id=50281 Signed-off-by: Alan Coopersmith Reviewed-by: Ian Romanick --- glx/glxdri.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/glx/glxdri.c b/glx/glxdri.c index a997e2f8a..1964d2e0c 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -645,8 +645,10 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, for (i = 0; i < pScreen->numVisuals; i++, visual++) if (visual->vid == glxConfig->visualID) break; - if (i == pScreen->numVisuals) + if (i == pScreen->numVisuals) { + free(context); return NULL; + } context->hwContextID = FakeClientID(0); @@ -655,8 +657,10 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, context->hwContextID, &hwContext); __glXleaveServer(GL_FALSE); - if (!retval) + if (!retval) { + free(context); return NULL; + } context->driContext = screen->legacy->createNewContext(screen->driScreen, config->driConfig, 0, /* render type */ driShare,