xf86-video-intel: src/i830_render.c

Eric Anholt anholt at kemper.freedesktop.org
Tue Jun 23 15:36:43 PDT 2009


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

New commits:
commit 6d025e679a99778496576af9a6a6fa8c043ae811
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Jun 23 09:53:14 2009 -0700

    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

diff --git a/src/i830_render.c b/src/i830_render.c
index 4bee5ba..b1d6f50 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


More information about the xorg-commit mailing list