commit 4eb6b55c103a34b23aa50541e6914d85f3c60110
author Yang Ni <yangni@google.com> Mon Apr 24 15:31:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 24 15:31:37 2017 +0000
tree 1d44955fc1653578ab06ce581a55ed1596412e33
parent bd59805508bae1cd77e2517bd43588eab0c7aa8a
parent bc5d0f4954a8ddb0fca200d742fdca9c9f6b499b

Merge "Increment sys ref count of input/output Allocations"

driver/rsdRuntimeStubs.cpp

diff --git a/driver/rsdRuntimeStubs.cpp b/driver/rsdRuntimeStubs.cpp
index 504f098..74c7918 100644
--- a/driver/rsdRuntimeStubs.cpp
+++ b/driver/rsdRuntimeStubs.cpp
@@ -683,10 +683,23 @@
     Allocation* inputs[RS_KERNEL_MAX_ARGUMENTS];
     for (int i = 0; i < numInputs; i++) {
         inputs[i] = (Allocation*)allocs[i].p;
+        CHECK_OBJ(inputs[i]);
+        inputs[i]->incSysRef();
     }
-    Allocation* out = hasOutput ? (Allocation*)allocs[numInputs].p : nullptr;
+    Allocation* out = nullptr;
+    if (hasOutput) {
+        out = (Allocation*)allocs[numInputs].p;
+        CHECK_OBJ(out);
+        out->incSysRef();
+    }
     rsrForEach(rsc, s, slot, numInputs, numInputs > 0 ? inputs : nullptr, out,
                nullptr, 0, (RsScriptCall*)options);
+    for (int i = 0; i < numInputs; i++) {
+        inputs[i]->decSysRef();
+    }
+    if (hasOutput) {
+        out->decSysRef();
+    }
 }
 
 void __attribute__((overloadable)) rsForEach(::rs_script script,