Mesa (master): anv: don't leak memory if anv_init_wsi() fails

Emil Velikov evelikov at kemper.freedesktop.org
Mon Nov 28 20:15:39 UTC 2016


Module: Mesa
Branch: master
Commit: a1cf494f7740c2afb851ffc3248e2cfa54d74ead
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1cf494f7740c2afb851ffc3248e2cfa54d74ead

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Nov 24 20:30:43 2016 +0000

anv: don't leak memory if anv_init_wsi() fails

brw_compiler_create() rzalloc-ates memory which we forgot to free.

Cc: "13.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/intel/vulkan/anv_device.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index a410376..0518aaf 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -208,8 +208,10 @@ anv_physical_device_init(struct anv_physical_device *device,
    device->compiler->shader_perf_log = compiler_perf_log;
 
    result = anv_init_wsi(device);
-   if (result != VK_SUCCESS)
-       goto fail;
+   if (result != VK_SUCCESS) {
+      ralloc_free(device->compiler);
+      goto fail;
+   }
 
    isl_device_init(&device->isl_dev, &device->info, swizzled);
 




More information about the mesa-commit mailing list