From: Vinson Lee <vlee@vmware.com>
Date: Mon, 1 Feb 2010 06:38:25 +0000 (-0800)
Subject: r300g: Fix memory leak on memory allocation failure.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2de590eacdebb2e34d451807d10fad4c52e2a5a7;p=mesa.git

r300g: Fix memory leak on memory allocation failure.
---

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index fa8ed581dae..4cef9a028af 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -375,8 +375,11 @@ struct pipe_screen* r300_create_screen(struct radeon_winsys* radeon_winsys)
     struct r300_screen* r300screen = CALLOC_STRUCT(r300_screen);
     struct r300_capabilities* caps = CALLOC_STRUCT(r300_capabilities);
 
-    if (!r300screen || !caps)
+    if (!r300screen || !caps) {
+        FREE(r300screen);
+        FREE(caps);
         return NULL;
+    }
 
     caps->pci_id = radeon_winsys->pci_id;
     caps->num_frag_pipes = radeon_winsys->gb_pipes;