From 9d36b3abfd557d8eb6a1a571d387dd53ef64068b Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Thu, 2 Aug 2012 23:28:10 -0700 Subject: u_blitter: Move a pointer dereference after null check. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes dereference before null check defect reported by Coverity. Signed-off-by: Vinson Lee Reviewed-by: Marek Olšák --- src/gallium/auxiliary/util/u_blitter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index b31ac2d5cea..22a828f4dee 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -941,14 +941,15 @@ void util_blitter_copy_texture(struct blitter_context *blitter, struct pipe_sampler_view src_templ, *src_view; unsigned bind; boolean is_stencil, is_depth; - const struct util_format_description *src_desc = - util_format_description(src->format); + const struct util_format_description *src_desc; /* Give up if textures are not set. */ assert(dst && src); if (!dst || !src) return; + src_desc = util_format_description(src->format); + assert(src->target < PIPE_MAX_TEXTURE_TYPES); /* Is this a ZS format? */ -- cgit v1.2.3