validate custom fields (#399)

* implemented validation of compact binary custom fields

1 files changed, 44 insertions, 1 deletions

diff --git a/src/zencore/compactbinaryvalidation.cpp b/src/zencore/compactbinaryvalidation.cpp
index 6f53bba69..833649b88 100644
--- a/src/zencore/compactbinaryvalidation.cpp
+++ b/src/zencore/compactbinaryvalidation.cpp
@@ -135,6 +135,37 @@ ValidateCbFloat64(MemoryView& View, CbValidateMode Mode, CbValidateError& Error)
 }
 
 /**
+ * Validate and read a fixed-size value from the view.
+ *
+ * Modifies the view to start at the end of the value, and adds error flags if applicable.
+ */
+static MemoryView
+ValidateCbFixedValue(MemoryView& View, CbValidateMode Mode, CbValidateError& Error, uint64_t Size)
+{
+	ZEN_UNUSED(Mode);
+
+	const MemoryView Value = View.Left(Size);
+	View += Size;
+	if (Value.GetSize() < Size)
+	{
+		AddError(Error, CbValidateError::OutOfBounds);
+	}
+	return Value;
+};
+
+/**
+ * Validate and read a value from the view where the view begins with the value size.
+ *
+ * Modifies the view to start at the end of the value, and adds error flags if applicable.
+ */
+static MemoryView
+ValidateCbDynamicValue(MemoryView& View, CbValidateMode Mode, CbValidateError& Error)
+{
+	const uint64_t ValueSize = ValidateCbUInt(View, Mode, Error);
+	return ValidateCbFixedValue(View, Mode, Error, ValueSize);
+}
+
+/**
  * Validate and read a string from the view.
  *
  * Modifies the view to start at the end of the string, and adds error flags if applicable.
@@ -378,8 +409,20 @@ ValidateCbField(MemoryView& View, CbValidateMode Mode, CbValidateError& Error, c
 			ValidateFixedPayload(12);
 			break;
 		case CbFieldType::CustomById:
+			{
+				MemoryView Value = ValidateCbDynamicValue(View, Mode, Error);
+				ValidateCbUInt(Value, Mode, Error);
+			}
+			break;
 		case CbFieldType::CustomByName:
-			ZEN_NOT_IMPLEMENTED();	// TODO: FIX!
+			{
+				MemoryView			   Value	= ValidateCbDynamicValue(View, Mode, Error);
+				const std::string_view TypeName = ValidateCbString(Value, Mode, Error);
+				if (TypeName.empty() && !EnumHasAnyFlags(Error, CbValidateError::OutOfBounds))
+				{
+					AddError(Error, CbValidateError::InvalidType);
+				}
+			}
 			break;
 	}