[ntdll] Don't do DVD_READ_STRUCTURE when inbuffer or outbuffer has issues (Coverity)

Paul Vriens Paul.Vriens at xs4all.nl
Mon Sep 18 07:18:24 CDT 2006


Hi,

this one (CID-59) was already marked as a bug. Don't call DVD_ReadStructure if
the checks above fail. 

Changelog
  Don't do DVD_READ_STRUCTURE when inbuffer or outbuffer has issues

Cheers,

Paul.

---
 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:
-- 
1.4.2.1




More information about the wine-patches mailing list