Add extra validation to libneuralnetworks_fuzzer

Bug: 143985934
Test: mma
Test: libneuralnetworks_fuzzer
Change-Id: I566fe442f99249de7f547e666b0252f6aee28cea

1 files changed, 4 insertions, 3 deletions

diff --git a/nn/runtime/test/android_fuzzing/FuzzTest.cpp b/nn/runtime/test/android_fuzzing/FuzzTest.cpp
index fecd2d7f9..40a028877 100644
--- a/nn/runtime/test/android_fuzzing/FuzzTest.cpp
+++ b/nn/runtime/test/android_fuzzing/FuzzTest.cpp
@@ -65,22 +65,23 @@ std::optional<Model> CreateModel(const TestModel& testModel) {
                 // Nothing to do here.
                 break;
         }
+        if (!model.isValid()) return std::nullopt;
     }
 
     // Operations.
     for (const auto& operation : testModel.operations) {
         model.addOperation(static_cast<int>(operation.type), operation.inputs, operation.outputs);
+        if (!model.isValid()) return std::nullopt;
     }
 
     // Inputs and outputs.
     model.identifyInputsAndOutputs(testModel.inputIndexes, testModel.outputIndexes);
+    if (!model.isValid()) return std::nullopt;
 
     // Relaxed computation.
     model.relaxComputationFloat32toFloat16(testModel.isRelaxed);
+    if (!model.isValid()) return std::nullopt;
 
-    if (!model.isValid()) {
-        return std::nullopt;
-    }
     if (model.finish() != Result::NO_ERROR) {
         return std::nullopt;
     }