diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-25 08:22:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-25 08:22:48 +0100 |
| commit | a0b4a1330be6a36ad095222d2ea83927cd33514d (patch) | |
| tree | 616920ca608751e843c92c9815069f43789e3097 /xorg-server/xkb/ddxLoad.c | |
| parent | 45710577f374972946a8eb37833a9c94e5a299bf (diff) | |
| download | vcxsrv-a0b4a1330be6a36ad095222d2ea83927cd33514d.tar.gz vcxsrv-a0b4a1330be6a36ad095222d2ea83927cd33514d.tar.bz2 vcxsrv-a0b4a1330be6a36ad095222d2ea83927cd33514d.zip | |
mesa xserver pixman git update 25 nov 2011
Diffstat (limited to 'xorg-server/xkb/ddxLoad.c')
| -rw-r--r-- | xorg-server/xkb/ddxLoad.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c index 219d39c9a..196142318 100644 --- a/xorg-server/xkb/ddxLoad.c +++ b/xorg-server/xkb/ddxLoad.c @@ -263,8 +263,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, if (xkbDebugFlags) DebugF("[xkb] xkb executes: %s\n",buf); if (nameRtrn) { - strncpy(nameRtrn,keymap,nameRtrnLen); - nameRtrn[nameRtrnLen-1]= '\0'; + strlcpy(nameRtrn,keymap,nameRtrnLen); } free(buf); #ifdef WIN32 @@ -322,8 +321,7 @@ FILE * file; } else file= NULL; if ((fileNameRtrn!=NULL)&&(fileNameRtrnLen>0)) { - strncpy(fileNameRtrn,buf,fileNameRtrnLen); - buf[fileNameRtrnLen-1]= '\0'; + strlcpy(fileNameRtrn,buf,fileNameRtrnLen); } return file; } |