commit 1efae29f4bbe6c165caf6dfc4b89cf8a5f8c469b
author Yang Ni <yangni@google.com> Sat Jun 27 15:45:18 2015 -0700
committer Yang Ni <yangni@google.com> Mon Jun 29 15:08:01 2015 -0700
tree 3f722af2fc29b941162be0e00979eb78d217e6cb
parent 1b6cd76d6fc1922bb8471a9afcbb576908a62db3

Avoid overwriting shared library file that is open

b/21949580

Writing different contents to an existing .so file, which is currently
open, may corrupt its globals and code. Choose a different file name
instead.

Change-Id: I3e649b09a55b43339283aa1c46f2844c66434c17
(cherry picked from commit 9844cffc8af28c4829012bc0c48f85d04b671f88)

cpu_ref/rsCpuScript.cpp

diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index b95d8f7..1909e13 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -862,10 +862,8 @@
 }
 
 RsdCpuScriptImpl::~RsdCpuScriptImpl() {
-    if (mScriptExec != nullptr) {
-        delete mScriptExec;
-    }
-    if (mBoundAllocs) delete[] mBoundAllocs;
+    delete mScriptExec;
+    delete[] mBoundAllocs;
     if (mScriptSO) {
         dlclose(mScriptSO);
     }