[Mesa-dev] [PATCH] st/mesa: fix sampler_view REALLOC/FREE macro mix-up

[Jose Fonseca]

To prevent this to ocurr again in the future we should be probably using os_malloc/os_free and friends instead of the overloaded MALLOC/FREE/etc macros.

We should probably kill MALLOC/FREE completely.

Jose

----- Original Message -----
> We were using REALLOC() from u_memory.h but FREE() from imports.h.
> This mismatch caused us to trash the heap on Windows after we
> deleted a texture object.
> 
> This fixes a regression from commit 6c59be7776e4d.
> ---
>  src/mesa/state_tracker/st_cb_texture.c |    2 +-
>  src/mesa/state_tracker/st_texture.c    |   12 ++++++++++++
>  src/mesa/state_tracker/st_texture.h    |    3 +++
>  3 files changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/state_tracker/st_cb_texture.c
> b/src/mesa/state_tracker/st_cb_texture.c
> index 353415b..304dc91 100644
> --- a/src/mesa/state_tracker/st_cb_texture.c
> +++ b/src/mesa/state_tracker/st_cb_texture.c
> @@ -155,7 +155,7 @@ st_DeleteTextureObject(struct gl_context *ctx,
>  
>     pipe_resource_reference(&stObj->pt, NULL);
>     st_texture_release_all_sampler_views(stObj);
> -   FREE(stObj->sampler_views);
> +   st_texture_free_sampler_views(stObj);
>     _mesa_delete_texture_object(ctx, texObj);
>  }
>  
> diff --git a/src/mesa/state_tracker/st_texture.c
> b/src/mesa/state_tracker/st_texture.c
> index 8d559df..cfa0605 100644
> --- a/src/mesa/state_tracker/st_texture.c
> +++ b/src/mesa/state_tracker/st_texture.c
> @@ -483,3 +483,15 @@ st_texture_release_all_sampler_views(struct
> st_texture_object *stObj)
>     for (i = 0; i < stObj->num_sampler_views; ++i)
>        pipe_sampler_view_reference(&stObj->sampler_views[i], NULL);
>  }
> +
> +
> +void
> +st_texture_free_sampler_views(struct st_texture_object *stObj)
> +{
> +   /* NOTE:
> +    * We use FREE() here to match REALLOC() above.  Both come from
> +    * u_memory.h, not imports.h.  If we mis-match MALLOC/FREE from
> +    * those two headers we can trash the heap.
> +    */
> +   FREE(stObj->sampler_views);
> +}
> diff --git a/src/mesa/state_tracker/st_texture.h
> b/src/mesa/state_tracker/st_texture.h
> index 87de9f9..f2afaf1 100644
> --- a/src/mesa/state_tracker/st_texture.h
> +++ b/src/mesa/state_tracker/st_texture.h
> @@ -241,4 +241,7 @@ st_texture_release_sampler_view(struct st_context *st,
>  extern void
>  st_texture_release_all_sampler_views(struct st_texture_object *stObj);
>  
> +void
> +st_texture_free_sampler_views(struct st_texture_object *stObj);
> +
>  #endif
> --
> 1.7.10.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/mesa-dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=NMr9uy2iTjWVixC0wOcYCWEIYhfo80qKwRgdodpoDzA%3D%0A&m=1olO9xu3XgincgJXOzgMZ%2F%2FOJ20%2FdB2ex7mU8kHIAi0%3D%0A&s=31ccb1bdd6a7109d026f0078b2a4777af1982e444491714c765af6f4ab57ebb6
>