[PATCH] libxkbfile: Fix mistyped argument of sizeof

Andreas Wettstein wettstein509 at solnet.ch
Sat Feb 15 08:35:50 PST 2014


A pointer rather than the buffer was given to sizeof.  As the data to be
written is only one or two bytes, a pointer size is at least four bytes, and
the buffer has 32 bytes, this error did not have negative effects.

Signed-off-by: Andreas Wettstein <wettstein509 at solnet.ch>
---
 src/xkbtext.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/xkbtext.c b/src/xkbtext.c
index bf992e4..4905f8b 100644
--- a/src/xkbtext.c
+++ b/src/xkbtext.c
@@ -920,11 +920,11 @@ CopyGroupActionArgs(Display *dpy, XkbDescPtr xkb, XkbAction *action,
     act = &action->group;
     TryCopyStr(buf, "group=", sz);
     if (act->flags & XkbSA_GroupAbsolute)
-        snprintf(tbuf, sizeof(buf), "%d", XkbSAGroup(act) + 1);
+        snprintf(tbuf, sizeof(tbuf), "%d", XkbSAGroup(act) + 1);
     else if (XkbSAGroup(act) < 0)
-        snprintf(tbuf, sizeof(buf), "%d", XkbSAGroup(act));
+        snprintf(tbuf, sizeof(tbuf), "%d", XkbSAGroup(act));
     else
-        snprintf(tbuf, sizeof(buf), "+%d", XkbSAGroup(act));
+        snprintf(tbuf, sizeof(tbuf), "+%d", XkbSAGroup(act));
     TryCopyStr(buf, tbuf, sz);
     if (act->type == XkbSA_LockGroup)
         return True;
-- 
1.8.3.1



More information about the xorg-devel mailing list