aboutsummaryrefslogtreecommitdiff
path: root/src/dynamic/sample
diff options
context:
space:
mode:
authorDavid Monahan <david.monahan@arm.com>2023-08-29 09:10:50 +0100
committerDavid Monahan <david.monahan@arm.com>2023-09-08 10:55:19 +0000
commit6a1d506cb0619c6bcf8685ada56ddf4507c2f2d4 (patch)
treebe43f5514cf38e06b6dae01886023915dd302eee /src/dynamic/sample
parent564c13dc098eb9353ac15e2609712ab8db9bf350 (diff)
downloadarmnn-6a1d506cb0619c6bcf8685ada56ddf4507c2f2d4.tar.gz
IVGCVSW-7901 Fix unsafe Usages of Memcpy in Armnn
* Updated usages of Memcpy to use proper checks for null instead of asserts * Added error checking in places where none existed Signed-off-by: David Monahan <david.monahan@arm.com> Change-Id: I9529acd966466ba281f88918be2ec372a756e183
Diffstat (limited to 'src/dynamic/sample')
-rw-r--r--src/dynamic/sample/SampleTensorHandle.cpp22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/dynamic/sample/SampleTensorHandle.cpp b/src/dynamic/sample/SampleTensorHandle.cpp
index c00861871c..80554aad3c 100644
--- a/src/dynamic/sample/SampleTensorHandle.cpp
+++ b/src/dynamic/sample/SampleTensorHandle.cpp
@@ -136,15 +136,29 @@ bool SampleTensorHandle::Import(void* memory, armnn::MemorySource source)
void SampleTensorHandle::CopyOutTo(void* dest) const
{
- const void *src = GetPointer();
- ARMNN_ASSERT(src);
+ const void* src = GetPointer();
+ if (dest == nullptr)
+ {
+ throw armnn::Exception("SampleTensorHandle:CopyOutTo: Destination Ptr is null");
+ }
+ if (src == nullptr)
+ {
+ throw armnn::Exception("SampleTensorHandle:CopyOutTo: Source Ptr is null");
+ }
memcpy(dest, src, m_TensorInfo.GetNumBytes());
}
void SampleTensorHandle::CopyInFrom(const void* src)
{
- void *dest = GetPointer();
- ARMNN_ASSERT(dest);
+ void* dest = GetPointer();
+ if (src == nullptr)
+ {
+ throw armnn::Exception("SampleTensorHandle:CopyInFrom: Source Ptr is null");
+ }
+ if (dest == nullptr)
+ {
+ throw armnn::Exception("SampleTensorHandle:CopyInFrom: Destination Ptr is null");
+ }
memcpy(dest, src, m_TensorInfo.GetNumBytes());
}