From 788e8d87772684aa57e0c26b3620fa83ac82bdb0 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Tue, 21 Mar 2023 16:15:11 -0700
Subject: [PATCH] Fix crash when FaceLandmarker does not return a result

PiperOrigin-RevId: 518410060
---
 .../geometry_pipeline_calculator.cc           | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/mediapipe/tasks/cc/vision/face_geometry/calculators/geometry_pipeline_calculator.cc b/mediapipe/tasks/cc/vision/face_geometry/calculators/geometry_pipeline_calculator.cc
index 4fbbf08e0..9dead7289 100644
--- a/mediapipe/tasks/cc/vision/face_geometry/calculators/geometry_pipeline_calculator.cc
+++ b/mediapipe/tasks/cc/vision/face_geometry/calculators/geometry_pipeline_calculator.cc
@@ -169,12 +169,11 @@ class GeometryPipelineCalculator : public CalculatorBase {
   }
 
   absl::Status Process(CalculatorContext* cc) override {
-    // Both the `IMAGE_SIZE` and the `MULTI_FACE_LANDMARKS` streams are required
-    // to have a non-empty packet. In case this requirement is not met, there's
-    // nothing to be processed at the current timestamp.
-    if (cc->Inputs().Tag(kImageSizeTag).IsEmpty() ||
-        (cc->Inputs().Tag(kMultiFaceLandmarksTag).IsEmpty() &&
-         cc->Inputs().Tag(kFaceLandmarksTag).IsEmpty())) {
+    // Both the `IMAGE_SIZE` and either the `FACE_LANDMARKS` or
+    // `MULTI_FACE_LANDMARKS` streams are required to have a non-empty packet.
+    // In case this requirement is not met, there's nothing to be processed at
+    // the current timestamp and we return early (checked here and below).
+    if (cc->Inputs().Tag(kImageSizeTag).IsEmpty()) {
       return absl::OkStatus();
     }
 
@@ -182,6 +181,10 @@ class GeometryPipelineCalculator : public CalculatorBase {
         cc->Inputs().Tag(kImageSizeTag).Get<std::pair<int, int>>();
 
     if (cc->Inputs().HasTag(kMultiFaceLandmarksTag)) {
+      if (cc->Inputs().Tag(kMultiFaceLandmarksTag).IsEmpty()) {
+        return absl::OkStatus();
+      }
+
       const auto& multi_face_landmarks =
           cc->Inputs()
               .Tag(kMultiFaceLandmarksTag)
@@ -202,10 +205,14 @@ class GeometryPipelineCalculator : public CalculatorBase {
           .AddPacket(mediapipe::Adopt<std::vector<FaceGeometry>>(
                          multi_face_geometry.release())
                          .At(cc->InputTimestamp()));
-    } else {
+    } else if (cc->Inputs().HasTag(kFaceLandmarksTag)) {
+      if (cc->Inputs().Tag(kFaceLandmarksTag).IsEmpty()) {
+        return absl::OkStatus();
+      }
+
       const auto& face_landmarks =
           cc->Inputs()
-              .Tag(kMultiFaceLandmarksTag)
+              .Tag(kFaceLandmarksTag)
               .Get<mediapipe::NormalizedLandmarkList>();
 
       ASSIGN_OR_RETURN(