ole32: Don't fail if the file ends during a big block.

Apparently, it's valid for the last block in a file to be incomplete.

ole32: Don't fail if the file ends during a big block.
2752c3bc · Vincent Povirk · Alexandre Julliard · 053be78e · 2752c3bc
Commit 2752c3bc authored Sep 07, 2010 by Vincent Povirk Committed by Alexandre Julliard Sep 08, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

storage32.c dlls/ole32/storage32.c +9 -2

No files found.
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -3875,13 +3875,20 @@ static BOOL StorageImpl_ReadBigBlock(
  void*          buffer)
 {
  ULARGE_INTEGER ulOffset;
-  DWORD  read;
+  DWORD  read=0;

  ulOffset.u.HighPart = 0;
  ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex);

  StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read);
-  return (read == This->bigBlockSize);
+
+  if (read && read < This->bigBlockSize)
+  {
+    /* File ends during this block; fill the rest with 0's. */
+    memset((LPBYTE)buffer+read, 0, This->bigBlockSize-read);
+  }
+
+  return (read != 0);
 }

 static BOOL StorageImpl_ReadDWordFromBigBlock(