Skip to content

N
nx-libs
Commit 7efa7da5 authored by Jeremy Huddleston's avatar Jeremy Huddleston Committed by Ulrich Sibiller
Browse files
Options

XKB: XkbComputeSectionBounds: Check correct bounds in default switch-case

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: 's avatarJeremy Huddleston <jeremyhu@apple.com> Reviewed-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 1d806a55
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
nx-X11/lib/X11/XKBGeom.c
View file @ 7efa7da5
...@@ -146,7 +146,7 @@ register int i; ...@@ -146,7 +146,7 @@ register int i;
XkbShapePtr shape; XkbShapePtr shape;
XkbRowPtr row; XkbRowPtr row;
XkbDoodadPtr doodad; XkbDoodadPtr doodad;
XkbBoundsPtr bounds,rbounds=NULL; XkbBoundsPtr bounds,rbounds;
if ((!geom)||(!section)) if ((!geom)||(!section))
return False; return False;
...@@ -185,6 +185,7 @@ XkbBoundsPtr bounds,rbounds=NULL; ...@@ -185,6 +185,7 @@ XkbBoundsPtr bounds,rbounds=NULL;
default: default:
tbounds.x1= tbounds.x2= doodad->any.left; tbounds.x1= tbounds.x2= doodad->any.left;
tbounds.y1= tbounds.y2= doodad->any.top; tbounds.y1= tbounds.y2= doodad->any.top;
rbounds= &tbounds;
break; break;
} }
_XkbCheckBounds(bounds,rbounds->x1,rbounds->y1); _XkbCheckBounds(bounds,rbounds->x1,rbounds->y1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment