Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Frameworks/base: Fix potential NPE in Script"

Browse Source
This commit is contained in:
Andreas Gampe
2015-03-18 22:18:25 +00:00
committed by Gerrit Code Review
parent e2c8e504d1 ad555f91a0
commit 8df1bedcba
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rs/java/android/renderscript/Script.java
View File

@@ -251,10 +251,15 @@ public class Script extends BaseObj {
"At least one of ain or aout is required to be non-null."); "At least one of ain or aout is required to be non-null.");
} }
long[] in_ids = new long[ains.length]; long[] in_ids;
if (ains != null) {
in_ids = new long[ains.length];
for (int index = 0; index < ains.length; ++index) { for (int index = 0; index < ains.length; ++index) {
in_ids[index] = ains[index].getID(mRS); in_ids[index] = ains[index].getID(mRS);
} }
} else {
in_ids = null;
}
long out_id = 0; long out_id = 0;
if (aout != null) { if (aout != null) {