From 6d025e679a99778496576af9a6a6fa8c043ae811 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue, 23 Jun 2009 09:53:14 -0700
Subject: Harden i830 render in case check_composite didn't throw out bad
 formats.

Fixes a warning in a static analysis program, and the code's a little
clearer.

Bug #21667
---
 src/i830_render.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i830_render.c b/src/i830_render.c
index 4bee5ba0..b1d6f508 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -250,9 +250,9 @@ i8xx_get_card_format(PicturePtr pPict)
 	    i++)
     {
 	if (i830_tex_formats[i].fmt == pPict->format)
-	    break;
+	    return i830_tex_formats[i].card_fmt;
     }
-    return i830_tex_formats[i].card_fmt;
+    FatalError("Unsupported format type %d\n", pPict->format);
 }
 
 static Bool
-- 
cgit v1.2.3