[ros-diffs] [reactos] 01/01: [KERNEL32] Check NtQueryInformationFile succeed before using its return. Also fix coding style CID 512966

[Pierre Schweitzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19f1cd78c15f7bd300287…

commit 19f1cd78c15f7bd3002871796d69a14711971e2d
Author: Pierre Schweitzer <pierre(a)reactos.org>
AuthorDate: Mon Oct 23 12:36:43 2017 +0200

    [KERNEL32] Check NtQueryInformationFile succeed before using its return. Also fix
coding style
    CID 512966
---
 dll/win32/kernel32/client/file/fileinfo.c | 134 +++++++++++++++++-------------
 1 file changed, 77 insertions(+), 57 deletions(-)

diff --git a/dll/win32/kernel32/client/file/fileinfo.c
b/dll/win32/kernel32/client/file/fileinfo.c
index 4b8df966c0..2721c82631 100644
--- a/dll/win32/kernel32/client/file/fileinfo.c
+++ b/dll/win32/kernel32/client/file/fileinfo.c
@@ -325,70 +325,90 @@ SetFilePointer(HANDLE hFile,
 BOOL
 WINAPI
 SetFilePointerEx(HANDLE hFile,
-		 LARGE_INTEGER liDistanceToMove,
-		 PLARGE_INTEGER lpNewFilePointer,
-		 DWORD dwMoveMethod)
+                 LARGE_INTEGER liDistanceToMove,
+                 PLARGE_INTEGER lpNewFilePointer,
+                 DWORD dwMoveMethod)
 {
-   FILE_POSITION_INFORMATION FilePosition;
-   FILE_STANDARD_INFORMATION FileStandard;
-   NTSTATUS errCode;
-   IO_STATUS_BLOCK IoStatusBlock;
+    NTSTATUS Status;
+    IO_STATUS_BLOCK IoStatusBlock;
+    FILE_POSITION_INFORMATION FilePosition;
+    FILE_STANDARD_INFORMATION FileStandard;
 
-   if(IsConsoleHandle(hFile))
-   {
-     SetLastError(ERROR_INVALID_HANDLE);
-     return FALSE;
-   }
+    if (IsConsoleHandle(hFile))
+    {
+        BaseSetLastNTError(STATUS_INVALID_HANDLE);
+        return FALSE;
+    }
 
-   switch(dwMoveMethod)
-   {
-     case FILE_CURRENT:
-	NtQueryInformationFile(hFile,
-			       &IoStatusBlock,
-			       &FilePosition,
-			       sizeof(FILE_POSITION_INFORMATION),
-			       FilePositionInformation);
-	FilePosition.CurrentByteOffset.QuadPart += liDistanceToMove.QuadPart;
-	break;
-     case FILE_END:
-	NtQueryInformationFile(hFile,
-                               &IoStatusBlock,
-                               &FileStandard,
-                               sizeof(FILE_STANDARD_INFORMATION),
-                               FileStandardInformation);
-        FilePosition.CurrentByteOffset.QuadPart =
-                  FileStandard.EndOfFile.QuadPart + liDistanceToMove.QuadPart;
-	break;
-     case FILE_BEGIN:
-        FilePosition.CurrentByteOffset.QuadPart = liDistanceToMove.QuadPart;
-	break;
-     default:
-        SetLastError(ERROR_INVALID_PARAMETER);
-	return FALSE;
-   }
+    switch (dwMoveMethod)
+    {
+        case FILE_CURRENT:
+        {
+            Status = NtQueryInformationFile(hFile, &IoStatusBlock,
+			                                &FilePosition,
+			                                sizeof(FILE_POSITION_INFORMATION),
+			                                FilePositionInformation);
+            if (!NT_SUCCESS(Status))
+            {
+                BaseSetLastNTError(Status);
+                return FALSE;
+            }
+
+	        FilePosition.CurrentByteOffset.QuadPart += liDistanceToMove.QuadPart;
+            break;
+        }
 
-   if(FilePosition.CurrentByteOffset.QuadPart < 0)
-   {
-     SetLastError(ERROR_NEGATIVE_SEEK);
-     return FALSE;
-   }
+        case FILE_END:
+        {
+            Status = NtQueryInformationFile(hFile, &IoStatusBlock,
+                                            &FileStandard,
+                                            sizeof(FILE_STANDARD_INFORMATION),
+                                            FileStandardInformation);
+            if (!NT_SUCCESS(Status))
+            {
+                BaseSetLastNTError(Status);
+                return FALSE;
+            }
+
+            FilePosition.CurrentByteOffset.QuadPart = FileStandard.EndOfFile.QuadPart +
+                                                      liDistanceToMove.QuadPart;
+            break;
+        }
 
-   errCode = NtSetInformationFile(hFile,
-				  &IoStatusBlock,
-				  &FilePosition,
-				  sizeof(FILE_POSITION_INFORMATION),
-				  FilePositionInformation);
-   if (!NT_SUCCESS(errCode))
-     {
-	BaseSetLastNTError(errCode);
-	return FALSE;
-     }
+        case FILE_BEGIN:
+        {
+            FilePosition.CurrentByteOffset.QuadPart = liDistanceToMove.QuadPart;
+            break;
+        }
 
-   if (lpNewFilePointer)
-     {
+        default:
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
+        }
+    }
+
+    if (FilePosition.CurrentByteOffset.QuadPart < 0)
+    {
+        SetLastError(ERROR_NEGATIVE_SEEK);
+        return FALSE;
+    }
+
+    Status = NtSetInformationFile(hFile, &IoStatusBlock, &FilePosition,
+                                  sizeof(FILE_POSITION_INFORMATION),
+                                  FilePositionInformation);
+    if (!NT_SUCCESS(Status))
+    {
+        BaseSetLastNTError(Status);
+        return FALSE;
+    }
+
+    if (lpNewFilePointer != NULL)
+    {
        *lpNewFilePointer = FilePosition.CurrentByteOffset;
-     }
-   return TRUE;
+    }
+
+    return TRUE;
 }