Merge branch 'main' into feat/HippyLogAdapter

Tencent · Jan 22, 2024 · 2f01585 · 2f01585
2 parents 19a1953 + 418afed
commit 2f01585
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/modules/footstone/include/footstone/deserializer.h b/modules/footstone/include/footstone/deserializer.h
@@ -37,7 +37,9 @@ class Deserializer {
   Deserializer(const Deserializer&) = delete;
   Deserializer& operator=(const Deserializer&) = delete;
 
-  void ReadHeader();
+  bool ReadHeader();
+
+  void ReadHeaderChecked();
 
   bool ReadValue(HippyValue& value);
 
@@ -93,6 +95,7 @@ class Deserializer {
   const uint8_t* position_;
   const uint8_t* const end_;
   uint32_t version_ = 0;
+  size_t length_ = 0;
 };
 }  // namespace base
 }  // namespace tdf
diff --git a/modules/footstone/src/deserializer.cc b/modules/footstone/src/deserializer.cc
@@ -36,9 +36,9 @@ using StringViewUtils = footstone::stringview::StringViewUtils;
 constexpr uint32_t kSupportedVersion = 15;
 
 Deserializer::Deserializer(const std::vector<const uint8_t>& data)
-    : position_(&data[0]), end_(&data[0] + data.size()) {}
+    : position_(&data[0]), end_(&data[0] + data.size()), length_(data.size()) {}
 
-Deserializer::Deserializer(const uint8_t* data, size_t size) : position_(data), end_(data + size) {}
+Deserializer::Deserializer(const uint8_t* data, size_t size) : position_(data), end_(data + size), length_(size) {}
 
 Deserializer::~Deserializer() = default;
 
@@ -47,12 +47,22 @@ bool Deserializer::ReadValue(HippyValue& value) {
   return ret;
 }
 
-void Deserializer::ReadHeader() {
+bool Deserializer::ReadHeader() {
   if (position_ < end_ && *position_ == static_cast<uint8_t>(SerializationTag::kVersion)) {
     SerializationTag tag;
     ReadTag(tag);
     version_ = ReadVarint<uint32_t>();
-    FOOTSTONE_CHECK(version_ <= kSupportedVersion);
+    if (version_ <= kSupportedVersion) return true;
+  }
+  return false;
+}
+
+void Deserializer::ReadHeaderChecked() {
+  if (position_ < end_ && *position_ == static_cast<uint8_t>(SerializationTag::kVersion)) {
+    SerializationTag tag;
+    ReadTag(tag);
+    version_ = ReadVarint<uint32_t>();
+    FOOTSTONE_CHECK(version_ <= kSupportedVersion) << "deserializer version is " << version_ << ", buffer size" << length_;
   }
 }
 

diff --git a/renderer/native/android/src/main/cpp/src/renderer/native_render_jni.cc b/renderer/native/android/src/main/cpp/src/renderer/native_render_jni.cc
@@ -265,9 +265,12 @@ void DoCallBack(JNIEnv *j_env, jobject j_object,
   if (j_buffer != nullptr && j_length > 0) {
     jbyte params_buffer[j_length];
     j_env->GetByteArrayRegion(j_buffer, j_offset, j_length, params_buffer);
-    footstone::value::Deserializer deserializer((const uint8_t*) params_buffer,
-                                        footstone::check::checked_numeric_cast<jlong, size_t>(j_length));
-    deserializer.ReadHeader();
+    footstone::value::Deserializer deserializer((const uint8_t*)params_buffer,
+                                                footstone::check::checked_numeric_cast<jlong, size_t>(j_length));
+    ret = deserializer.ReadHeader();
+    FOOTSTONE_CHECK(ret) << "Deserializer read header failed. function name " << func_name << ", root id " << root_id
+                        << ", node id " << node_id << "callback id " << cb_id << ", offset " << j_offset << ", length "
+                        << j_length;
     deserializer.ReadValue(*params);
   }
 
@@ -334,9 +337,12 @@ void OnReceivedEvent(JNIEnv* j_env, jobject j_object, jint j_render_manager_id,
     jbyte params_buffer[j_length];
     j_env->GetByteArrayRegion(j_buffer, j_offset, j_length, params_buffer);
     params = std::make_shared<HippyValue>();
-    footstone::value::Deserializer deserializer((const uint8_t*) params_buffer,
-                                         footstone::check::checked_numeric_cast<jlong, size_t>(j_length));
-    deserializer.ReadHeader();
+    footstone::value::Deserializer deserializer((const uint8_t*)params_buffer,
+                                                footstone::check::checked_numeric_cast<jlong, size_t>(j_length));
+    ret = deserializer.ReadHeader();
+    FOOTSTONE_CHECK(ret) << "Deserializer read header failed. event name " << event_name << ", root id " << root_id
+                        << ", node id " << dom_id << ", offset " << j_offset << ", length "
+                        << j_length;
     deserializer.ReadValue(*params);
   }