From e0b1b88e8367f7d31ee4a4dcdc25c8d0676e6911 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 29 Jun 2015 15:10:17 +0200 Subject: vaapi: fix potential NULL deref on memory allocation failure --- video/vaapi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'video/vaapi.c') diff --git a/video/vaapi.c b/video/vaapi.c index bcae33d410..7ba07b9a2c 100644 --- a/video/vaapi.c +++ b/video/vaapi.c @@ -395,11 +395,12 @@ static struct mp_image *try_download(struct mp_image *src, struct mp_image tmp; if (va_image_map(p->ctx, image, &tmp)) { dst = mp_image_pool_get(pool, tmp.imgfmt, tmp.w, tmp.h); - if (dst) + if (dst) { mp_image_copy(dst, &tmp); + mp_image_copy_attributes(dst, src); + } va_image_unmap(p->ctx, image); } - mp_image_copy_attributes(dst, src); return dst; } -- cgit v1.2.3