summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2016-03-05 13:07:07 +0100
committerJulien Isorce <j.isorce@samsung.com>2016-04-08 06:57:17 +0100
commitb9855dcdf7c94605305d6372d1f9883f76d10b6a (patch)
tree0dd54e5f9feafcebfbca3ffcec0ec77648f61ac2
parent1cd19ebc4a892ada69f9085892441c00674b2764 (diff)
downloadexternal_mesa3d-b9855dcdf7c94605305d6372d1f9883f76d10b6a.zip
external_mesa3d-b9855dcdf7c94605305d6372d1f9883f76d10b6a.tar.gz
external_mesa3d-b9855dcdf7c94605305d6372d1f9883f76d10b6a.tar.bz2
st/va: avoid dereference after free in vlVaDestroyImage
Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Tested-by: Julien Isorce <j.isorce@samsung.com>
-rw-r--r--src/gallium/state_trackers/va/image.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/state_trackers/va/image.c
index 2c42a98..92d014c 100644
--- a/src/gallium/state_trackers/va/image.c
+++ b/src/gallium/state_trackers/va/image.c
@@ -280,6 +280,7 @@ vlVaDestroyImage(VADriverContextP ctx, VAImageID image)
{
vlVaDriver *drv;
VAImage *vaimage;
+ VAStatus status;
if (!ctx)
return VA_STATUS_ERROR_INVALID_CONTEXT;
@@ -294,8 +295,9 @@ vlVaDestroyImage(VADriverContextP ctx, VAImageID image)
handle_table_remove(VL_VA_DRIVER(ctx)->htab, image);
pipe_mutex_unlock(drv->mutex);
+ status = vlVaDestroyBuffer(ctx, vaimage->buf);
FREE(vaimage);
- return vlVaDestroyBuffer(ctx, vaimage->buf);
+ return status;
}
VAStatus