From 110950318c14ef8e97021de157d936f022f37027 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Thu, 13 Sep 2018 20:56:55 +0200 Subject: st/nine: Check if format is DS before retrieving flags d3d9_get_pipe_depth_format_bindings assumes the input format is a depth stencil format. Previously the user could hit this function with an invalid format. Protect the last non protected call with a depth_stencil_format check. Another solution is to have d3d9_get_pipe_depth_format_bindings support non depth stencil format, but we don't want the user to create depth buffers with d3d formats that can't be one, it's better to check if the format can be depth buffer with d3d. Signed-off-by: Axel Davy --- src/gallium/state_trackers/nine/surface9.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gallium/state_trackers/nine') diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c index 71aa4f46ffd..5fd662fa049 100644 --- a/src/gallium/state_trackers/nine/surface9.c +++ b/src/gallium/state_trackers/nine/surface9.c @@ -111,6 +111,8 @@ NineSurface9_ctor( struct NineSurface9 *This, if (pDesc->Usage & D3DUSAGE_RENDERTARGET) { This->base.info.bind |= PIPE_BIND_RENDER_TARGET; } else if (pDesc->Usage & D3DUSAGE_DEPTHSTENCIL) { + if (!depth_stencil_format(pDesc->Format)) + return D3DERR_INVALIDCALL; This->base.info.bind = d3d9_get_pipe_depth_format_bindings(pDesc->Format); if (TextureType) This->base.info.bind |= PIPE_BIND_SAMPLER_VIEW; -- cgit v1.2.3