From fab5ee65b6354944bdb45001839b0cd0ba1115be Mon Sep 17 00:00:00 2001 From: Alex Henrie <alexhenrie24@gmail.com> Date: Tue, 29 Dec 2015 22:37:59 -0700 Subject: [PATCH] ntdll: Return an error from CDROM_Open if fstat fails. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> --- dlls/ntdll/cdrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index ee2a743e669..ee360459230 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -667,7 +667,7 @@ static NTSTATUS CDROM_Open(int fd, int* dev) NTSTATUS ret = STATUS_SUCCESS; int empty = -1; - fstat(fd, &st); + if (fstat(fd, &st) == -1) return FILE_GetNtStatus(); RtlEnterCriticalSection( &cache_section ); for (*dev = 0; *dev < MAX_CACHE_ENTRIES; (*dev)++) @@ -2834,7 +2834,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, { DWORD sz = 0; NTSTATUS status = STATUS_SUCCESS; - int fd, needs_close, dev; + int fd, needs_close, dev = 0; TRACE("%p %s %p %d %p %d %p\n", hDevice, iocodex(dwIoControlCode), lpInBuffer, nInBufferSize, -- GitLab