commit 77020c5248ca0921d7d24fb60dec5105ba39026c
author Jason Sams <rjsams@android.com> Tue Nov 22 12:49:11 2011 -0800
committer Jason Sams <rjsams@android.com> Tue Nov 22 13:17:18 2011 -0800
tree 79182ae64e155cd49dc18e45de933cca2561b0d2
parent 791916465b75a6ffcc5e08bb230bf7737a9149d4

Fix script init error handling.

Change-Id: I7ceb0af4dfd12db0274985ff658f678d7af829ff

rsScript.cpp

diff --git a/rsScript.cpp b/rsScript.cpp
index 16446dd..7fc128e 100644
--- a/rsScript.cpp
+++ b/rsScript.cpp
@@ -26,6 +26,7 @@
 
     mSlots = NULL;
     mTypes = NULL;
+    mInitialized = false;
 }
 
 Script::~Script() {

rsScript.h

diff --git a/rsScript.h b/rsScript.h
index abb55b8..976ae78 100644
--- a/rsScript.h
+++ b/rsScript.h
@@ -85,6 +85,7 @@
     virtual void setupScript(Context *rsc) = 0;
     virtual uint32_t run(Context *) = 0;
 protected:
+    bool mInitialized;
     ObjectBaseRef<Allocation> *mSlots;
     ObjectBaseRef<const Type> *mTypes;
 

rsScriptC.cpp

diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index b45366b..a5b1902 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -44,8 +44,10 @@
         BT = NULL;
     }
 #endif
-    mRSC->mHal.funcs.script.invokeFreeChildren(mRSC, this);
-    mRSC->mHal.funcs.script.destroy(mRSC, this);
+    if (mInitialized) {
+        mRSC->mHal.funcs.script.invokeFreeChildren(mRSC, this);
+        mRSC->mHal.funcs.script.destroy(mRSC, this);
+    }
 }
 
 void ScriptC::setupScript(Context *rsc) {
@@ -212,8 +214,11 @@
     bitcodeLen = BT->getTranslatedBitcodeSize();
 #endif
 
-    rsc->mHal.funcs.script.init(rsc, this, resName, cacheDir, bitcode, bitcodeLen, 0);
+    if (!rsc->mHal.funcs.script.init(rsc, this, resName, cacheDir, bitcode, bitcodeLen, 0)) {
+        return false;
+    }
 
+    mInitialized = true;
     mEnviroment.mFragment.set(rsc->getDefaultProgramFragment());
     mEnviroment.mVertex.set(rsc->getDefaultProgramVertex());
     mEnviroment.mFragmentStore.set(rsc->getDefaultProgramStore());