From c38e37d7e7a787b5ef602a51119ed544e9f1842a Mon Sep 17 00:00:00 2001
From: Michael Butler <butlermichael@google.com>
Date: Tue, 26 May 2020 14:40:05 -0700
Subject: Omit dimensions for HAS_NO_VALUE operands

Bug: 157268934
Test: mma
Test: libneuralnetworks_fuzzer
Change-Id: I5d78db36b110eaec2230478c4759f94f386d59c3
---
 nn/runtime/ExecutionBuilder.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nn/runtime')

diff --git a/nn/runtime/ExecutionBuilder.cpp b/nn/runtime/ExecutionBuilder.cpp
index 61e320f9a..d65d96446 100644
--- a/nn/runtime/ExecutionBuilder.cpp
+++ b/nn/runtime/ExecutionBuilder.cpp
@@ -876,7 +876,11 @@ std::vector<OutputShape> ExecutionBuilder::getInitialOutputShapes() const {
     std::vector<OutputShape> outputShapes(mOutputs.size());
     std::transform(mOutputs.begin(), mOutputs.end(), outputShapes.begin(),
                    [](const auto& x) -> OutputShape {
-                       return {.dimensions = x.dimensions(), .isSufficient = true};
+                       hidl_vec<uint32_t> dimensions;
+                       if (x.state() != ModelArgumentInfo::HAS_NO_VALUE) {
+                           dimensions = x.dimensions();
+                       }
+                       return {.dimensions = std::move(dimensions), .isSufficient = true};
                    });
     return outputShapes;
 }
-- 
cgit v1.2.3