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

matchDriverFromFiles: use one snprintf instead of strncpy/cat series 

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-29 10:32:52 -07:00
parent 6e6d732bac
commit d9243777c7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/common/xf86pciBus.c
View File

@ -1219,9 +1219,8 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip
/* A tiny bit of sanity checking. We should probably do better */ /* A tiny bit of sanity checking. We should probably do better */
if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) { if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {
/* We need the full path name to open the file */ /* We need the full path name to open the file */
strncpy(path_name, PCI_TXT_IDS_PATH, 256); snprintf(path_name, sizeof(path_name), "%s/%s",
strncat(path_name, "/", 1); PCI_TXT_IDS_PATH, direntry->d_name);
strncat(path_name, direntry->d_name, (256 - strlen(path_name) - 1));
fp = fopen(path_name, "r"); fp = fopen(path_name, "r");
if (fp == NULL) { if (fp == NULL) {
xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n", path_name); xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n", path_name);