projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
09edc05
)
st/nine: Prevent crash in GetRenderTargetData
author
Patrick Rudolph
<siro@das-labor.org>
Wed, 28 Sep 2016 16:50:19 +0000
(18:50 +0200)
committer
Axel Davy
<axel.davy@ens.fr>
Mon, 10 Oct 2016 21:43:51 +0000
(23:43 +0200)
Return error instead of crashing on source surfaces
with format D3DFMT_NULL.
Fix for issue #236.
Tested on Windows 7.
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
src/gallium/state_trackers/nine/device9.c
patch
|
blob
|
history
diff --git
a/src/gallium/state_trackers/nine/device9.c
b/src/gallium/state_trackers/nine/device9.c
index
47fd3a4
..
b094ede
100644
(file)
--- a/
src/gallium/state_trackers/nine/device9.c
+++ b/
src/gallium/state_trackers/nine/device9.c
@@
-1464,6
+1464,8
@@
NineDevice9_GetRenderTargetData( struct NineDevice9 *This,
user_assert(src->desc.Width == dst->desc.Width, D3DERR_INVALIDCALL);
user_assert(src->desc.Height == dst->desc.Height, D3DERR_INVALIDCALL);
+ user_assert(src->desc.Format != D3DFMT_NULL, D3DERR_INVALIDCALL);
+
NineSurface9_CopyDefaultToMem(dst, src);
return D3D_OK;