From c987ef04bea345d5810e60cf6c53b747ddbe910e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed, 4 May 2011 15:31:17 -0700
Subject: [PATCH] Revert "XKB: Avoid a possible NULL dereference"

Sorry for the noise.  I accidentally pushed and didn't mean to. =(

This reverts commit 4024091678ea07e0d898b798df9b29f3bf68eb08.
---
 src/xkb/XKBGeom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
index 71a7d4ac..383e0de2 100644
--- a/src/xkb/XKBGeom.c
+++ b/src/xkb/XKBGeom.c
@@ -146,7 +146,7 @@ register int	i;
 XkbShapePtr	shape;
 XkbRowPtr	row;
 XkbDoodadPtr	doodad;
-XkbBoundsPtr	bounds,rbounds;
+XkbBoundsPtr	bounds,rbounds=NULL;
 
     if ((!geom)||(!section))
 	return False;
@@ -185,7 +185,7 @@ XkbBoundsPtr	bounds,rbounds;
 	    default:
 		tbounds.x1= tbounds.x2= doodad->any.left;
 		tbounds.y1= tbounds.y2= doodad->any.top;
-		continue;
+		break;
 	}
 	_XkbCheckBounds(bounds,rbounds->x1,rbounds->y1);
 	_XkbCheckBounds(bounds,rbounds->x2,rbounds->y2);