Check for missing method-related field before creating MethodMeta (#1507)

dbort · facebook-github-bot · commit 700bcb3a9333 · 2024-01-04T14:42:23.000-08:00
Summary: Pull Request resolved: #1507 Some MethodMeta methods don't return Error, assuming that the underlying data is valid. Ensure that the underlying ExecutionPlan is valid for those fields before returning a MethodMeta. For fields whose accessors do return Error or Result, we can check them at the time they're called and return non-fatally then. Reviewed By: lucylq Differential Revision: D52451736 fbshipit-source-id: 24e7f603cd53274b46cc6b8ff89f8b084e218c8a
diff --git a/runtime/executor/program.cpp b/runtime/executor/program.cpp
@@ -227,6 +227,13 @@ Result<Method> Program::load_method(
   internal::event_tracer_create_event_block(event_tracer, "Default");
   internal::EventTracerProfileScope event_tracer_scope =
       internal::EventTracerProfileScope(event_tracer, "Program::load_method");
+  // If we can't create a MethodMeta for the Method, the Method is corrupt;
+  // Method::method_meta() assumes success, so we must fail here.
+  Result<MethodMeta> meta = method_meta(method_name);
+  if (!meta.ok()) {
+    return meta.error();
+  }
+
   auto plan = get_execution_plan(internal_program_, method_name);
   if (!plan.ok()) {
     return plan.error();
@@ -239,6 +246,20 @@ Result<MethodMeta> Program::method_meta(const char* method_name) const {
   if (!plan.ok()) {
     return plan.error();
   }
+  // Check any fields whose accessors don't return Result<> in case they're
+  // missing or corrupt.
+  ET_CHECK_OR_RETURN_ERROR(
+      plan.get()->name() != nullptr, InvalidProgram, "Missing name field");
+  ET_CHECK_OR_RETURN_ERROR(
+      plan.get()->non_const_buffer_sizes() != nullptr,
+      InvalidProgram,
+      "Missing non_const_buffer_sizes field");
+  ET_CHECK_OR_RETURN_ERROR(
+      plan.get()->inputs() != nullptr, InvalidProgram, "Missing inputs field");
+  ET_CHECK_OR_RETURN_ERROR(
+      plan.get()->outputs() != nullptr,
+      InvalidProgram,
+      "Missing outputs field");
   return MethodMeta(plan.get());
 }
 
