From 9fe0ab8bd1b9efa44ad83f3add9580e8d46dde58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Mon, 3 Sep 2018 19:34:13 +0900 Subject: [PATCH] [neurun] Change check condition for addOperation & addOperationEx (#2551) Change check condition for addOperation & addOperationEx to same with pacl Signed-off-by: Hyeongseok Oh --- runtimes/neurun/src/frontend/model.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/runtimes/neurun/src/frontend/model.cc b/runtimes/neurun/src/frontend/model.cc index 04237dd..82ed2fa 100644 --- a/runtimes/neurun/src/frontend/model.cc +++ b/runtimes/neurun/src/frontend/model.cc @@ -179,8 +179,7 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model, const uint32_t *inputs, uint32_t outputCount, const uint32_t *outputs) { - if ((model == nullptr) || ((inputs == nullptr) && (inputCount != 0)) || - ((outputs == nullptr) && (outputCount != 0))) + if ((model == nullptr) || (inputs == nullptr) || (outputs == nullptr)) { return ANEURALNETWORKS_UNEXPECTED_NULL; } @@ -324,8 +323,7 @@ int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model, const uint32_t *inputs, uint32_t outputCount, const uint32_t *outputs) { - if ((model == nullptr) || ((inputs == nullptr) && (inputCount != 0)) || - ((outputs == nullptr) && (outputCount != 0))) + if ((model == nullptr) || (inputs == nullptr) || (outputs == nullptr)) { return ANEURALNETWORKS_UNEXPECTED_NULL; } @@ -355,6 +353,12 @@ int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model, } } + // Workaround: to avoid compile error by unused-parameter, use inputCount + if (inputCount == 0) + { + return ANEURALNETWORKS_BAD_DATA; + } + switch (type) { default: -- 2.7.4