[PATCH 6/6] msvcrt: Check for _getdiskfree the second argument, and set proper errno value.
Kai Tietz
ktietz70 at googlemail.com
Thu Aug 8 07:52:35 CDT 2013
Hi,
the last of this series.
Ok for apply?
Kai
>From d15aaf7944300e83271c8430e5ff9ce3513690a3 Mon Sep 17 00:00:00 2001
From: Kai Tietz <ktietz70 at googlemail.com>
Date: Thu, 29 Dec 2011 16:15:40 +0100
Subject: [PATCH 6/6] msvcrt: Check for _getdiskfree the second argument, and
set proper errno value.
---
dlls/msvcrt/dir.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 9a97ea2..4ce3297 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -1270,8 +1270,11 @@ unsigned int CDECL MSVCRT__getdiskfree(unsigned
int disk, struct MSVCRT__diskfre
DWORD ret[4];
unsigned int err;
- if (disk > 26)
- return ERROR_INVALID_PARAMETER; /* MSVCRT doesn't set errno here */
+ if (!d || disk > 26)
+ {
+ *MSVCRT__errno() = MSVCRT_EINVAL;
+ return ERROR_INVALID_PARAMETER;
+ }
drivespec[0] += disk; /* make a drive letter */
--
1.7.9
More information about the wine-patches
mailing list