commit d5e94651972510f2b7a608e7e9161ad58f09e8cb
author Kevin May <kevin.may@arm.com> Thu Nov 07 14:02:14 2019 +0000
committer Kevin May <kevin.may@arm.com> Fri Nov 08 10:57:03 2019 +0000
tree d32065818f906a492b83920bbd477a9d37f7b749
parent 60a346b348a71b62ca26dcbb33eb881203ee0a68

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

ArmnnDriverImpl.cpp

diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp
index 64188bb..de80445 100644
--- a/ArmnnDriverImpl.cpp
+++ b/ArmnnDriverImpl.cpp
@@ -150,7 +150,7 @@
         return ErrorStatus::NONE;
     }
 
-    unique_ptr<ArmnnPreparedModel<HalPolicy>> preparedModel(
+    sp<ArmnnPreparedModel<HalPolicy>> preparedModel(
             new ArmnnPreparedModel<HalPolicy>(
                     netId,
                     runtime.get(),
@@ -180,7 +180,7 @@
         }
     }
 
-    NotifyCallbackAndCheck(cb, ErrorStatus::NONE, preparedModel.release());
+    NotifyCallbackAndCheck(cb, ErrorStatus::NONE, preparedModel);
 
     return ErrorStatus::NONE;
 }