From 156cce698093023d9e79a4ff4fb96f4e4d3019db Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Wed, 3 Mar 2010 13:03:18 -0800
Subject: Improve RS error handling.  On errors RS will now store the error and
 a message that can be read from the app.  RS will then not continue rendering
 frames while an unchecked error is present until new state is received.

---
 libs/rs/rsScript.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libs/rs/rsScript.cpp')

diff --git a/libs/rs/rsScript.cpp b/libs/rs/rsScript.cpp
index cb1436b0bacd..a33933b689c8 100644
--- a/libs/rs/rsScript.cpp
+++ b/libs/rs/rsScript.cpp
@@ -96,6 +96,10 @@ void rsi_ScriptSetInvoke(Context *rsc, const char *name, uint32_t slot)
 void rsi_ScriptInvoke(Context *rsc, RsScript vs, uint32_t slot)
 {
     Script *s = static_cast<Script *>(vs);
+    if (s->mEnviroment.mInvokables[slot] == NULL) {
+        rsc->setError(RS_ERROR_BAD_SCRIPT, "Calling invoke on bad script");
+        return;
+    }
     s->setupScript();
     s->mEnviroment.mInvokables[slot]();
 }
-- 
cgit v1.2.3-59-g8ed1b