aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColm Donelan <colm.donelan@arm.com>2022-05-09 17:52:23 +0100
committerColm Donelan <colm.donelan@arm.com>2022-05-09 17:52:23 +0100
commitbb7b281fb2056eb0124f04014acac48c9c525995 (patch)
tree7db74289def6fecb327c58dab8cc0c673a6b03ff
parent915f2a7327098636cc5a292510cd00b715e67e90 (diff)
downloadandroid-nn-driver-bb7b281fb2056eb0124f04014acac48c9c525995.tar.gz
IVGCVSW-6127 Fixing seg fault in LayerInputHandle
* Fixing a segmentation fault when SanitizeQuantizationScale is called on a LayerInputHandle whose m_OutputSlot is nullptr. Signed-off-by: Colm Donelan <colm.donelan@arm.com> Change-Id: I447c405086ff327a28a72938fbf82844d715a17d
-rw-r--r--ConversionUtils.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/ConversionUtils.cpp b/ConversionUtils.cpp
index 91c1ae4e..f441e7dc 100644
--- a/ConversionUtils.cpp
+++ b/ConversionUtils.cpp
@@ -62,14 +62,17 @@ const armnn::TensorInfo& LayerInputHandle::GetTensorInfo() const
void LayerInputHandle::SanitizeQuantizationScale(LayerInputHandle& weight,
LayerInputHandle& input)
{
- armnn::TensorInfo weightInfo = weight.GetTensorInfo();
- armnn::TensorInfo inputInfo = input.GetTensorInfo();
- armnn::TensorInfo biasInfo = GetTensorInfo();
+ if (m_OutputSlot)
+ {
+ armnn::TensorInfo weightInfo = weight.GetTensorInfo();
+ armnn::TensorInfo inputInfo = input.GetTensorInfo();
+ armnn::TensorInfo biasInfo = GetTensorInfo();
- SanitizeBiasQuantizationScale(biasInfo, weightInfo, inputInfo);
+ SanitizeBiasQuantizationScale(biasInfo, weightInfo, inputInfo);
- m_TensorInfo = biasInfo;
- m_OutputSlot->SetTensorInfo(biasInfo);
+ m_TensorInfo = biasInfo;
+ m_OutputSlot->SetTensorInfo(biasInfo);
+ }
}
ConstTensorPin::ConstTensorPin(bool optional)