From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 10 Aug 2014 21:51:29 +0000 (+0000)
Subject: [USETUP]
X-Git-Tag: backups/0.3.17@66124~807
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a4d36a3511181e6f44a5c9b8060d00cc1078b101

[USETUP]
- Don't access next block if there is none in CabinetExtractFile.

svn path=/trunk/; revision=63859
---

diff --git a/reactos/base/setup/usetup/cabinet.c b/reactos/base/setup/usetup/cabinet.c
index 9f0242557bc..1d16ac0d956 100644
--- a/reactos/base/setup/usetup/cabinet.c
+++ b/reactos/base/setup/usetup/cabinet.c
@@ -1098,7 +1098,7 @@ CabinetExtractFile(PCAB_SEARCH Search)
         Size -= OutputLength;
         /* reduce remaining block size by bytes consumed */
         RemainingBlock -= InputLength;
-        if (RemainingBlock == 0)
+        if (Size > 0 && RemainingBlock == 0)
         {
             /* used up this block, move on to the next */
             DPRINT("Out of block data\n");