Module: wine Branch: master Commit: 741fe13d445d73293d54066ad4a9a9d9cbecb96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=741fe13d445d73293d54066ad4...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Aug 31 10:48:39 2017 +0200
kernel32: Silence buffer overflow gcc warnings.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/oldconfig.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 6c80dc6..219ecc5 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -290,7 +290,8 @@ static void create_hardware_branch(void) { if (strncmp(dent->d_name, "hd", 2) == 0) { - sprintf(cStr, procname_ide_media, dent->d_name); + if (snprintf(cStr, sizeof(cStr), procname_ide_media, dent->d_name) >= sizeof(cStr)) + continue; procfile = fopen(cStr, "r"); if (!procfile) { @@ -306,7 +307,8 @@ static void create_hardware_branch(void) if (nType == DRIVE_UNKNOWN) continue; }
- sprintf(cStr, procname_ide_model, dent->d_name); + if (snprintf(cStr, sizeof(cStr), procname_ide_model, dent->d_name) >= sizeof(cStr)) + continue; procfile = fopen(cStr, "r"); if (!procfile) { @@ -322,7 +324,8 @@ static void create_hardware_branch(void) cDevModel[strlen(cDevModel) - 1] = 0; }
- sprintf(cUnixDeviceName, "/dev/%s", dent->d_name); + if (snprintf(cUnixDeviceName, sizeof(cUnixDeviceName), "/dev/%s", dent->d_name) >= sizeof(cUnixDeviceName)) + continue; scsi_addr.PortNumber = (dent->d_name[2] - 'a') / 2; scsi_addr.PathId = 0; scsi_addr.TargetId = (dent->d_name[2] - 'a') % 2;