commit 17de62e9cb624b74377c6a80c0f9aff75f15dcd6
author Kevin May <kevin.may@arm.com> Mon Jul 31 12:16:04 2023 +0100
committer Kevin May <kevin.may@arm.com> Mon Jul 31 14:41:33 2023 +0000
tree b72cdf2faf77294cc36557b50cf3abf238f93352
parent 15b05304087df1e84a08b9961c2bc4071594985b

IVGCVSW-7787 Fix READ memory access caused by missing printf arguments


Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: Ibea856e1420ad3ff14aef2cdb3d8ee918fb1bcf1

1.0/HalPolicy.cpp

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index 08de1b5..ce57818 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -615,7 +615,7 @@
 
     if (desc.m_BlockSize <= 1)
     {
-        return Fail("%s: Block size must be at least 1 in all dimensions");
+        return Fail("%s: Block size must be at least 1 in all dimensions", __func__);
     }
 
     const Operand* output = GetOutputOperand<hal_1_0::HalPolicy>(operation, 0, model);

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 78e0e20..2e3a042 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -2511,7 +2511,7 @@
     GetInputScalar<HalPolicy>(operation, 1, HalOperandType::INT32, descriptor.m_BlockSize, model, data);
     if (descriptor.m_BlockSize <= 1)
     {
-        return Fail("%s: Block size must be at least 1 in all dimensions");
+        return Fail("%s: Block size must be at least 1 in all dimensions", __func__);
     }
 
     descriptor.m_DataLayout = armnn::DataLayout::NHWC;

ConversionUtils_1_2.hpp

diff --git a/ConversionUtils_1_2.hpp b/ConversionUtils_1_2.hpp
index 5b38b07..670463f 100644
--- a/ConversionUtils_1_2.hpp
+++ b/ConversionUtils_1_2.hpp
@@ -2324,7 +2324,7 @@
 
     if (desc.m_BlockSize <= 1)
     {
-        return Fail("%s: Block size must be at least 1 in all dimensions");
+        return Fail("%s: Block size must be at least 1 in all dimensions", __func__);
     }
 
     desc.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 2, model, data);