Re: [Mesa-dev] [PATCH 2/2] st/shader_cache: Fix memory leak

2017-04-02 Thread Brian Paul 
On Sun, Apr 2, 2017 at 11:31 AM, Bartosz Tomczyk <
bartosz.tomczy...@gmail.com> wrote:

> ---
>  src/mesa/state_tracker/st_shader_cache.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/src/mesa/state_tracker/st_shader_cache.c
> b/src/mesa/state_tracker/st_shader_cache.c
> index e8c7289ec6..5dbcb74f73 100644
> --- a/src/mesa/state_tracker/st_shader_cache.c
> +++ b/src/mesa/state_tracker/st_shader_cache.c
> @@ -135,6 +135,8 @@ st_store_tgsi_in_disk_cache(struct st_context *st,
> struct gl_program *prog,
>_mesa_shader_stage_to_string(prog->info.stage), sha1_buf);
> }
>
> +   if(blob->data)
> +  free(blob->data);
>

free() should accept NULL, so the conditional shouldn't be needed.

-Brian



> free(blob);
>  }
>
> --
> 2.12.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 2/2] st/shader_cache: Fix memory leak

2017-04-02 Thread Bartosz Tomczyk 
---
 src/mesa/state_tracker/st_shader_cache.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/state_tracker/st_shader_cache.c 
b/src/mesa/state_tracker/st_shader_cache.c
index e8c7289ec6..5dbcb74f73 100644
--- a/src/mesa/state_tracker/st_shader_cache.c
+++ b/src/mesa/state_tracker/st_shader_cache.c
@@ -135,6 +135,8 @@ st_store_tgsi_in_disk_cache(struct st_context *st, struct 
gl_program *prog,
   _mesa_shader_stage_to_string(prog->info.stage), sha1_buf);
}
 
+   if(blob->data)
+  free(blob->data);
free(blob);
 }
 
-- 
2.12.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev