Mesa (master): nvc0: fix crash when nv50_miptree_from_handle fails
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Wed Oct 28 17:19:58 UTC 2015
Module: Mesa
Branch: master
Commit: 3bbb8715acd1cb85ea7aa7763c06cd12347a1a9a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bbb8715acd1cb85ea7aa7763c06cd12347a1a9a
Author: Julien Isorce <j.isorce at samsung.com>
Date: Tue Oct 20 17:34:23 2015 +0100
nvc0: fix crash when nv50_miptree_from_handle fails
Signed-off-by: Julien Isorce <j.isorce at samsung.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
src/gallium/drivers/nouveau/nvc0/nvc0_resource.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c
index 12b5a02..15c803c 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c
@@ -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;
}
}
More information about the mesa-commit
mailing list