frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert dmxSetDefaultFontPath to use strdup instead of malloc+strncpy 

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Alan Coopersmith 2011-10-28 21:25:20 -07:00
parent d9243777c7
commit 03ddca6f71
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/dmx/dmxinit.c
View File

@ -800,20 +800,17 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
/* RATS: Assuming the fp string (which comes from the command-line argv /* RATS: Assuming the fp string (which comes from the command-line argv
vector) is NULL-terminated, the buffer is large enough for the vector) is NULL-terminated, the buffer is large enough for the
strcpy. */ strcpy. */
static void dmxSetDefaultFontPath(char *fp) static void dmxSetDefaultFontPath(const char *fp)
{ {
int fplen = strlen(fp) + 1;
if (dmxFontPath) { if (dmxFontPath) {
int len; int fplen = strlen(fp) + 1;
int len = strlen(dmxFontPath);
len = strlen(dmxFontPath);
dmxFontPath = realloc(dmxFontPath, len+fplen+1); dmxFontPath = realloc(dmxFontPath, len+fplen+1);
dmxFontPath[len] = ','; dmxFontPath[len] = ',';
strncpy(&dmxFontPath[len+1], fp, fplen); strncpy(&dmxFontPath[len+1], fp, fplen);
} else { } else {
dmxFontPath = malloc(fplen); dmxFontPath = strdup(fp);
strncpy(dmxFontPath, fp, fplen);
} }
defaultFontPath = dmxFontPath; defaultFontPath = dmxFontPath;