[NTOS] Remove unnecessary NULL checks and add a missing one. CIDs 1411958, 716670...

diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c
index d62e18d..4958478 100644 (file)
--- a/ntoskrnl/cc/fs.c
+++ b/ntoskrnl/cc/fs.c
@@ -337,7 +337,6 @@ CcUninitializeCacheMap (
         FileObject, TruncateSize, UninitializeCompleteEvent);
 
     if (TruncateSize != NULL &&
-        FileObject->SectionObjectPointer != NULL &&
         FileObject->SectionObjectPointer->SharedCacheMap != NULL)
     {
         SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;

diff --git a/ntoskrnl/dbgk/dbgkobj.c b/ntoskrnl/dbgk/dbgkobj.c
index d0f8c85..3f03e9b 100644 (file)
--- a/ntoskrnl/dbgk/dbgkobj.c
+++ b/ntoskrnl/dbgk/dbgkobj.c
@@ -775,7 +775,7 @@ DbgkpPostFakeThreadMessages(IN PEPROCESS Process,
     {
         /* Dereference and fail */
         if (pFirstThread) ObDereferenceObject(pFirstThread);
-        if (pLastThread) ObDereferenceObject(pLastThread);
+        ObDereferenceObject(pLastThread);
         return Status;
     }
 

diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c
index e4ffdd6..e241334 100644 (file)
--- a/ntoskrnl/ex/init.c
+++ b/ntoskrnl/ex/init.c
@@ -1501,7 +1501,7 @@ Phase1InitializationDiscard(IN PVOID Context)
     if (!PoInitSystem(0)) KeBugCheck(INTERNAL_POWER_ERROR);
 
     /* Check for Y2K hack */
-    Y2KHackRequired = strstr(CommandLine, "YEAR");
+    Y2KHackRequired = CommandLine ? strstr(CommandLine, "YEAR") : NULL;
     if (Y2KHackRequired) Y2KHackRequired = strstr(Y2KHackRequired, "=");
     if (Y2KHackRequired) YearHack = atol(Y2KHackRequired + 1);