From 7ab17383a66085cd0fcba80ca0f25d12383a81eb Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 10 Oct 2021 13:38:10 +0100
Subject: [PATCH] Fix for NPE when serialized block bytes are unavailable.

---
 src/main/java/org/qortal/repository/BlockArchiveReader.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/qortal/repository/BlockArchiveReader.java b/src/main/java/org/qortal/repository/BlockArchiveReader.java
index 2621bade..cff272a8 100644
--- a/src/main/java/org/qortal/repository/BlockArchiveReader.java
+++ b/src/main/java/org/qortal/repository/BlockArchiveReader.java
@@ -174,6 +174,9 @@ public class BlockArchiveReader {
         Integer height = this.fetchHeightForSignature(signature, repository);
         if (height != null) {
             byte[] blockBytes = this.fetchSerializedBlockBytesForHeight(height);
+            if (blockBytes == null) {
+                return null;
+            }
 
             // When responding to a peer with a BLOCK message, we must prefix the byte array with the block height
             // This mimics the toData() method in BlockMessage and CachedBlockMessage