From 62eb309c6be36156fa2814a975306a3c8de53196 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 5 Feb 2018 18:43:06 +0000 Subject: [PATCH] Set verification as failed in dicformat as soon as any block fails. --- DiscImageChef.DiscImages/DiscImageChef.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/DiscImageChef.DiscImages/DiscImageChef.cs b/DiscImageChef.DiscImages/DiscImageChef.cs index 140195a9d..a78eab33c 100644 --- a/DiscImageChef.DiscImages/DiscImageChef.cs +++ b/DiscImageChef.DiscImages/DiscImageChef.cs @@ -1791,9 +1791,12 @@ namespace DiscImageChef.DiscImages verifyCrc = crcVerify.Final(); if(BitConverter.ToUInt64(verifyCrc, 0) != blockHeader.cmpCrc64) + { DicConsole.DebugWriteLine("DiscImageChef format plugin", - "Expected block CRC {0:X16} but got {1:X16}", - blockHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0)); + "Expected block CRC {0:X16} but got {1:X16}", blockHeader.cmpCrc64, + BitConverter.ToUInt64(verifyCrc, 0)); + return false; + } break; case BlockType.DeDuplicationTable: @@ -1829,7 +1832,7 @@ namespace DiscImageChef.DiscImages if(BitConverter.ToUInt64(verifyCrc, 0) != ddtHeader.cmpCrc64) { DicConsole.DebugWriteLine("DiscImageChef format plugin", - "Expected block CRC {0:X16} but got {1:X16}", ddtHeader.cmpCrc64, + "Expected DDT CRC {0:X16} but got {1:X16}", ddtHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0)); return false; }