- fixed uninitialized variable warning

- ProbeAndCaptureUnicodeString should check if allocating memory succeeded

svn path=/trunk/; revision=18061

diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h
index 44b750e..0d2c38a 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h
@@ -130,11 +130,16 @@ ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest,
     /* Allocate space for the buffer */
     Buffer = ExAllocatePool(PagedPool, Dest->MaximumLength);
 
     /* Allocate space for the buffer */
     Buffer = ExAllocatePool(PagedPool, Dest->MaximumLength);
 

-    /* Copy it */
-    RtlCopyMemory(Buffer, Dest->Buffer, Dest->MaximumLength);
+    if (Buffer != NULL)
+    {
+        /* Copy it */
+        RtlCopyMemory(Buffer, Dest->Buffer, Dest->MaximumLength);

 
 

-    /* Set it as the buffer */
-    Dest->Buffer = Buffer;
+        /* Set it as the buffer */
+        Dest->Buffer = Buffer;
+    }
+    else
+        Status = STATUS_INSUFFICIENT_RESOURCES;

 
     /* Return */
     return Status;
 
     /* Return */
     return Status;

diff --git a/reactos/ntoskrnl/io/driver.c b/reactos/ntoskrnl/io/driver.c
index 23f6761..33fd808 100644 (file)
--- a/reactos/ntoskrnl/io/driver.c
+++ b/reactos/ntoskrnl/io/driver.c
@@ -1852,7 +1852,7 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName)
    RTL_QUERY_REGISTRY_TABLE QueryTable[3];
    UNICODE_STRING ImagePath;
    UNICODE_STRING ServiceName;
    RTL_QUERY_REGISTRY_TABLE QueryTable[3];
    UNICODE_STRING ImagePath;
    UNICODE_STRING ServiceName;

-   UNICODE_STRING CapturedDriverServiceName;
+   UNICODE_STRING CapturedDriverServiceName = {0};

    KPROCESSOR_MODE PreviousMode;
    NTSTATUS Status;
    ULONG Type;
    KPROCESSOR_MODE PreviousMode;
    NTSTATUS Status;
    ULONG Type;