From 12fb31815db9de9c01f2d4155a2b74531777c0bf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 7 Dec 2009 12:58:57 +1000 Subject: [PATCH] xkb: don't assign garbage value to led_return. As the comment for the function states, led_return is undefined if map is NULL. We might as well skip writing to it then. Found by clang. Reported-by: Tomas Carnecky Signed-off-by: Peter Hutterer Reviewed-by: Jamey Sharp --- xkb/xkb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xkb/xkb.c b/xkb/xkb.c index 00ae29cd7..35f8d1cbd 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -3273,20 +3273,21 @@ _XkbFindNamedIndicatorMap(XkbSrvLedInfoPtr sli, Atom indicator, int *led_return) { XkbIndicatorMapPtr map; - int led; /* search for the right indicator */ map = NULL; if (sli->names && sli->maps) { + int led; + for (led = 0; (led < XkbNumIndicators) && (map == NULL); led++) { if (sli->names[led] == indicator) { map= &sli->maps[led]; + *led_return = led; break; } } } - *led_return = led; return map; }