[ros-diffs] [cwittich] 27443: -fix a memory leak -don't use uninitialized memory

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Jul  7 05:39:19 2007
New Revision: 27443

URL: http://svn.reactos.org/svn/reactos?rev=27443&view=rev
Log:
-fix a memory leak
-don't use uninitialized memory

Modified:
    trunk/reactos/drivers/storage/scsiport/scsiport.c

Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport.c?rev=27443&r1=27442&r2=27443&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.c (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul  7 05:39:19 2007
@@ -68,6 +68,7 @@
 ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject,
 		    IN PIRP Irp);
 
+static DRIVER_DISPATCH ScsiPortDispatchScsi;
 static NTSTATUS STDCALL
 ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject,
 		     IN PIRP Irp);
@@ -76,6 +77,7 @@
 ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject,
 		      IN PIRP Irp);
 
+static DRIVER_STARTIO ScsiPortStartIo;
 static VOID STDCALL
 ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject,
 		IN PIRP Irp);
@@ -111,6 +113,7 @@
               IN UCHAR Lun,
               IN UCHAR QueueTag);
 
+static KSERVICE_ROUTINE ScsiPortIsr;
 static BOOLEAN STDCALL
 ScsiPortIsr(IN PKINTERRUPT Interrupt,
 	    IN PVOID ServiceContext);
@@ -136,6 +139,7 @@
 SpiSendRequestSense(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
                     IN PSCSI_REQUEST_BLOCK Srb);
 
+static IO_COMPLETION_ROUTINE SpiCompletionRoutine;
 NTSTATUS STDCALL
 SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject,
                      PIRP Irp,
@@ -2063,6 +2067,7 @@
 
     DPRINT ("SpiGetPciConfiguration() called\n");
 
+	RtlZeroMemory(&ResourceList, sizeof(PCM_RESOURCE_LIST));
     SlotNumber.u.AsULONG = 0;
 
     /* Loop through all devices */
@@ -3022,7 +3027,10 @@
 
     SenseBuffer = ExAllocatePoolWithTag (NonPagedPool, SENSE_BUFFER_SIZE, TAG_SCSIPORT);
     if (SenseBuffer == NULL)
+    {
+        ExFreePool(InquiryBuffer);
         return STATUS_INSUFFICIENT_RESOURCES;
+    }
 
     while (KeepTrying)
     {
@@ -4304,6 +4312,8 @@
 
     /* We need to acquire spinlock */
     KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock);
+
+	RtlZeroMemory(&InterruptData, sizeof(SCSI_PORT_INTERRUPT_DATA));
 
 TryAgain: