Paul Vriens : ntdll: Don' t do DVD_READ_STRUCTURE when inbuffer or outbuffer has issues (Coverity).

Alexandre Julliard julliard at wine.codeweavers.com
Wed Sep 20 13:26:59 CDT 2006


Module: wine
Branch: master
Commit: 0c7ecacf470ee483a6d73f7ca4767e85f92ce7ed
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=0c7ecacf470ee483a6d73f7ca4767e85f92ce7ed

Author: Paul Vriens <Paul.Vriens at xs4all.nl>
Date:   Mon Sep 18 14:18:24 2006 +0200

ntdll: Don't do DVD_READ_STRUCTURE when inbuffer or outbuffer has issues (Coverity).

---

 dlls/ntdll/cdrom.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 60074b0..2e46f68 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -2261,8 +2261,11 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hD
         sz = sizeof(DVD_LAYER_DESCRIPTOR);
         if (lpInBuffer == NULL || nInBufferSize != sizeof(DVD_READ_STRUCTURE)) status = STATUS_INVALID_PARAMETER;
         else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL;
-        TRACE("doing DVD_READ_STRUCTURE\n");
-        status = DVD_ReadStructure(fd, (PDVD_READ_STRUCTURE)lpInBuffer, (PDVD_LAYER_DESCRIPTOR)lpOutBuffer);
+        else
+        {
+            TRACE("doing DVD_READ_STRUCTURE\n");
+            status = DVD_ReadStructure(fd, (PDVD_READ_STRUCTURE)lpInBuffer, (PDVD_LAYER_DESCRIPTOR)lpOutBuffer);
+        }
         break;
 
     case IOCTL_SCSI_GET_INQUIRY_DATA:




More information about the wine-cvs mailing list