Merge branch 'main' into lm/oidctoken-exe-path

1 files changed, 9 insertions, 10 deletions

diff --git a/src/zenstore/cache/cacherpc.cpp b/src/zenstore/cache/cacherpc.cpp
index 660c66b9a..94abcf547 100644
--- a/src/zenstore/cache/cacherpc.cpp
+++ b/src/zenstore/cache/cacherpc.cpp
@@ -594,16 +594,16 @@ CacheRpcHandler::HandleRpcGetCacheRecords(const CacheRequestContext& Context, Cb
 			{
 				FoundLocalInvalid = true;
 			}
-			else if (CbValidateError Error = ValidateCompactBinary(Request.RecordCacheValue.GetView(), CbValidateMode::Default);
-					 Error != CbValidateError::None)
+			else if (CbObjectView RecordObject = CbObjectView(Request.RecordCacheValue.GetData());
+					 RecordObject.GetSize() != Request.RecordCacheValue.GetSize())
 			{
 				ZEN_WARN("HandleRpcGetCacheRecords stored record is corrupt, compact binary format validation failed. Reason: '{}'",
-						 ToString(Error));
+						 "Object size does not match payload size");
 				FoundLocalInvalid = true;
 			}
 			else
 			{
-				Request.RecordObject = CbObjectView(Request.RecordCacheValue.GetData());
+				Request.RecordObject = std::move(RecordObject);
 				ParseValues(Request);
 
 				Request.Complete			   = true;
@@ -1710,16 +1710,15 @@ CacheRpcHandler::GetLocalCacheRecords(const CacheRequestContext&				 Context,
 				Record.ValuesRead = true;
 				if (Record.CacheValue && Record.CacheValue.GetContentType() == ZenContentType::kCbObject)
 				{
-					if (CbValidateError Error = ValidateCompactBinary(Record.CacheValue.GetView(), CbValidateMode::Default);
-						Error != CbValidateError::None)
+					if (CbObjectView RecordObject = CbObjectView(Record.CacheValue.GetData());
+						RecordObject.GetSize() != Record.CacheValue.GetSize())
 					{
-						ZEN_WARN("GetLocalCacheRecords stored record for is corrupt, compact binary format validation failed. Reason: '{}'",
-								 ToString(Error));
+						ZEN_WARN("GetLocalCacheRecords stored record is corrupt, compact binary format validation failed. Reason: '{}'",
+								 "Object size does not match payload size");
 					}
 					else
 					{
-						CbObjectView RecordObject = CbObjectView(Record.CacheValue.GetData());
-						CbArrayView	 ValuesArray  = RecordObject["Values"sv].AsArrayView();
+						CbArrayView ValuesArray = RecordObject["Values"sv].AsArrayView();
 						Record.Values.reserve(ValuesArray.Num());
 						for (CbFieldView ValueField : ValuesArray)
 						{