diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-05-04 15:31:17 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-05-04 15:31:17 -0700 |
| commit | c987ef04bea345d5810e60cf6c53b747ddbe910e (patch) | |
| tree | 775c12e8efcb18f662090736d813ab06b307d363 | |
| parent | 46d04bc4e7ff6c86385002c929d8eb0310f737a8 (diff) | |
Revert "XKB: Avoid a possible NULL dereference"
Sorry for the noise. I accidentally pushed and didn't mean to. =(
This reverts commit 4024091678ea07e0d898b798df9b29f3bf68eb08.
| -rw-r--r-- | src/xkb/XKBGeom.c | 4 |
1 files 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); |