From 1155ed2048a24f4dfcfa65d63243b77973f820d6 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 2 May 2024 17:40:30 +0200
Subject: fix zero size attachment replies (#69)

- Bugfix: Don't try to respond with zero size partial cache value when partial size is zero
- Improvement: Added more validation of data read from cache / cas
---
 src/zenserver/projectstore/projectstore.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/zenserver/projectstore/projectstore.cpp')

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index f5fecce24..45a96c60d 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -3431,9 +3431,16 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 				IoBuffer ChunkBuffer = m_CidStore.FindChunkByCid(RawHash);
 				if (ChunkBuffer)
 				{
-					ResponseWriter.AddHash(RawHash);
-					ResponsePackage.AddAttachment(
-						CbAttachment(CompressedBuffer::FromCompressedNoValidate(std::move(ChunkBuffer)), RawHash));
+					CompressedBuffer Compressed = CompressedBuffer::FromCompressedNoValidate(std::move(ChunkBuffer));
+					if (Compressed)
+					{
+						ResponseWriter.AddHash(RawHash);
+						ResponsePackage.AddAttachment(CbAttachment(std::move(Compressed), RawHash));
+					}
+					else
+					{
+						ZEN_WARN("invalid compressed binary in cas store for {}", RawHash);
+					}
 				}
 			}
 			ResponseWriter.EndArray();
-- 
cgit v1.2.3