From 6522cf8a43c03a4426267654265edb6417acc4d8 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Thu, 14 Nov 2024 21:17:41 -0600
Subject: [PATCH] [keel] Add ensureValid call to readAsset

---
 src/olympic/keel/include/keel/asset.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/olympic/keel/include/keel/asset.hpp b/src/olympic/keel/include/keel/asset.hpp
index 6fbd55843..7142f6604 100644
--- a/src/olympic/keel/include/keel/asset.hpp
+++ b/src/olympic/keel/include/keel/asset.hpp
@@ -7,6 +7,8 @@
 #include <ox/claw/claw.hpp>
 #include <ox/fs/fs.hpp>
 
+#include "validation.hpp"
+
 namespace keel {
 
 constexpr auto K1HdrSz = 40;
@@ -26,7 +28,9 @@ ox::Result<T> readAsset(ox::BufferView buff) noexcept {
 	if (!err) {
 		offset = K1HdrSz; // the size of K1 headers
 	}
-	return ox::readClaw<T>(buff + offset);
+	auto out = ox::readClaw<T>(buff + offset);
+	oxReturnError(out);
+	return ensureValid(out.value);
 }
 
 ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, ox::BufferView buff) noexcept;