OSDN Git Service

nvc0: fix crash when nv50_miptree_from_handle fails
authorJulien Isorce <j.isorce@samsung.com>
Tue, 20 Oct 2015 16:34:23 +0000 (17:34 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sat, 7 Nov 2015 15:17:49 +0000 (15:17 +0000)
Signed-off-by: Julien Isorce <j.isorce@samsung.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
(cherry picked from commit 3bbb8715acd1cb85ea7aa7763c06cd12347a1a9a)
Nominated-by: Emil Velikov <emil.velikov@collabora.co.uk>
src/gallium/drivers/nouveau/nvc0/nvc0_resource.c

index 12b5a02..15c803c 100644 (file)
@@ -26,7 +26,8 @@ nvc0_resource_from_handle(struct pipe_screen * screen,
    } else {
       struct pipe_resource *res = nv50_miptree_from_handle(screen,
                                                            templ, whandle);
-      nv04_resource(res)->vtbl = &nvc0_miptree_vtbl;
+      if (res)
+         nv04_resource(res)->vtbl = &nvc0_miptree_vtbl;
       return res;
    }
 }