Bug fixes

src/primitives/block.cpp

@@ -178,6 +178,10 @@ int32_t CBlockHeader::GetPBaaSHeader(CPBaaSBlockHeader &pbh, const uint160 &cID)
         {
             int32_t len = CVerusSolutionVector::solutionTools.ExtraDataLen(nSolution);
             int32_t numHeaders = d.numPBaaSHeaders;
+            if (numHeaders * sizeof(CPBaaSBlockHeader) > len)
+            {
+                numHeaders = len / sizeof(CPBaaSBlockHeader);
+            }
             const CPBaaSBlockHeader *ppbbh = CVerusSolutionVector::solutionTools.GetFirstPBaaSHeader(nSolution);
             for (int32_t i = 0; i < numHeaders; i++)
             {

vcutil/fetch-bootstrap.bat

@@ -27,7 +27,7 @@ CALL :MAIN
     FOR %%x IN (CURL.EXE BITSADMIN.EXE) DO IF NOT [%%~$PATH:x]==[] IF NOT DEFINED DOWNLOAD_CMD SET "DOWNLOAD_CMD=FETCH_%%x"
     CALL :SET_INSTALL_DIR
     SET "USE_BOOTSTRAP=1"
-    SET i=0
+    DEL /Q/S "!Temp!\!BOOTSTRAP_PACKAGE_SIG!" >NUL
     IF NOT EXIST "!VRSC_DATA_DIR!" (
         ECHO No VRSC data directory found, creating directory.
         MD "!VRSC_DATA_DIR!"
@@ -42,8 +42,8 @@ CALL :MAIN
             EXIT 1
         )
      )
-     CALL :FETCH_BOOTSTRAP
-     EXIT 0
+    CALL :FETCH_BOOTSTRAP
+    EXIT 0
 GOTO :EOF
 
 :SET_INSTALL_DIR
@@ -69,10 +69,8 @@ GOTO :EOF
 GOTO :EOF
 
 :CLEAN_UP_DOWNLOADS
-    FOR %%F IN (!BOOTSTRAP_PACKAGE!, !BOOTSTRAP_PACKAGE_SIG!) DO (
-        IF  EXIST "!Temp!\%%F" (
-            DEL /Q "!Temp!\%%F"
-    )
+    DEL /Q/S "!Temp!\!BOOTSTRAP_PACKAGE!" >NUL
+    DEL /Q/S "!Temp!\!BOOTSTRAP_PACKAGE_SIG!" >NUL
 GOTO :EOF
 
 :CHECK_BLOCKCHAIN_DATA

vcutil/fetch-bootstrap.sh

@@ -171,7 +171,7 @@ function verify_checksum() {
 Verifying $filename checksum
 EOF
   "$SHA256CMD" $SHA256ARGS -c <<EOF
-$expectedhash $dlname
+$expectedhash  $dlname
 EOF
 }