diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-06-21 10:57:09 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-22 11:30:54 +0200 |
| commit | 054e906f6059366150bb7426973542203c8a0e4c (patch) | |
| tree | 2d8a0cd3f269ea07658f24cfb7d68f4c01202016 /nx-X11/programs/Xserver/xkb/maprules.c | |
| parent | 2070891cb85c5229dc81661ecf424df57134833a (diff) | |
| download | nx-libs-054e906f6059366150bb7426973542203c8a0e4c.tar.gz nx-libs-054e906f6059366150bb7426973542203c8a0e4c.tar.bz2 nx-libs-054e906f6059366150bb7426973542203c8a0e4c.zip | |
xkb: Use snprintf to measure string lengths instead of manual strlen math
commit a4a2e814d5d0e6152307a301eda1d6fc1c555aaa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 13 21:36:02 2011 -0800
xkb: Use snprintf to measure string lengths instead of manual strlen math
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/maprules.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/maprules.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/maprules.c b/nx-X11/programs/Xserver/xkb/maprules.c index af6c112fe..6bc7e4022 100644 --- a/nx-X11/programs/Xserver/xkb/maprules.c +++ b/nx-X11/programs/Xserver/xkb/maprules.c @@ -953,9 +953,8 @@ Bool ok; if ((!base)||(!rules)) return False; if (locale) { - if (strlen(base)+strlen(locale)+2 > PATH_MAX) + if (snprintf(buf, PATH_MAX, "%s-%s", base, locale) >= PATH_MAX) return False; - sprintf(buf,"%s-%s", base, locale); } else { if (strlen(base)+1 > PATH_MAX) |