From 4024091678ea07e0d898b798df9b29f3bf68eb08 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 4 May 2011 11:34:53 -0700 Subject: [PATCH] XKB: Avoid a possible NULL dereference XKBGeom.c:191:25: warning: Access to field 'x1' results in a dereference of a null pointer (loaded from variable 'rbounds') _XkbCheckBounds(bounds,rbounds->x1,rbounds->y1); ^~~~~~~ Found-by: clang static analyzer Signed-off-by: Jeremy Huddleston --- 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 e9e36d0c..2365f480 100644 --- a/src/xkb/XKBGeom.c +++ b/src/xkb/XKBGeom.c @@ -147,7 +147,7 @@ register int i; XkbShapePtr shape; XkbRowPtr row; XkbDoodadPtr doodad; -XkbBoundsPtr bounds,rbounds=NULL; +XkbBoundsPtr bounds,rbounds; if ((!geom)||(!section)) return False; @@ -186,7 +186,7 @@ XkbBoundsPtr bounds,rbounds=NULL; default: tbounds.x1= tbounds.x2= doodad->any.left; tbounds.y1= tbounds.y2= doodad->any.top; - break; + continue; } _XkbCheckBounds(bounds,rbounds->x1,rbounds->y1); _XkbCheckBounds(bounds,rbounds->x2,rbounds->y2);