aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin May <kevin.may@arm.com>2019-11-07 14:02:14 +0000
committerKevin May <kevin.may@arm.com>2019-11-08 10:57:03 +0000
commitd5e94651972510f2b7a608e7e9161ad58f09e8cb (patch)
treed32065818f906a492b83920bbd477a9d37f7b749
parent60a346b348a71b62ca26dcbb33eb881203ee0a68 (diff)
downloadandroid-nn-driver-d5e94651972510f2b7a608e7e9161ad58f09e8cb.tar.gz
IVGCVSW-3987 Fix for potential unique_ptr.release() bug
* Use an android strong pointer instead of a unique_ptr to avoid undefined behaviour of releasing unique_ptr to strong pointer Signed-off-by: Kevin May <kevin.may@arm.com> Change-Id: Icac255ba2407796888f20ffaba99a7988cb6f63c
-rw-r--r--ArmnnDriverImpl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp
index 64188bbf..de80445a 100644
--- a/ArmnnDriverImpl.cpp
+++ b/ArmnnDriverImpl.cpp
@@ -150,7 +150,7 @@ Return<ErrorStatus> ArmnnDriverImpl<HalPolicy>::prepareModel(
return ErrorStatus::NONE;
}
- unique_ptr<ArmnnPreparedModel<HalPolicy>> preparedModel(
+ sp<ArmnnPreparedModel<HalPolicy>> preparedModel(
new ArmnnPreparedModel<HalPolicy>(
netId,
runtime.get(),
@@ -180,7 +180,7 @@ Return<ErrorStatus> ArmnnDriverImpl<HalPolicy>::prepareModel(
}
}
- NotifyCallbackAndCheck(cb, ErrorStatus::NONE, preparedModel.release());
+ NotifyCallbackAndCheck(cb, ErrorStatus::NONE, preparedModel);
return ErrorStatus::NONE;
}