diff options
| author | Miao Wang <miaowang@google.com> | 2015-01-15 11:09:23 -0800 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-01-21 21:17:19 +0000 |
| commit | b590b354ef407c1c60288d2f8c3950d2f53d14fa (patch) | |
| tree | ce0d11c926f03e6f0b23cb18ebf7f50af1e87e10 /rs/java/android/renderscript/Allocation.java | |
| parent | 298071951210ae23c8023c4dc8f82da5d1760211 (diff) | |
| download | frameworks_base-b590b354ef407c1c60288d2f8c3950d2f53d14fa.zip frameworks_base-b590b354ef407c1c60288d2f8c3950d2f53d14fa.tar.gz frameworks_base-b590b354ef407c1c60288d2f8c3950d2f53d14fa.tar.bz2 | |
[Renderscript] Add check for Allocation.copyTo(Array) and
Fix the input allocation type check for Histogram Intrinsic.
Bug: 19035242
Change-Id: I0ef2672bf816854db90fc92dc9ef51d1d231c246
Diffstat (limited to 'rs/java/android/renderscript/Allocation.java')
| -rw-r--r-- | rs/java/android/renderscript/Allocation.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index 3cda6de..4e89566 100644 --- a/rs/java/android/renderscript/Allocation.java +++ b/rs/java/android/renderscript/Allocation.java @@ -1262,6 +1262,10 @@ public class Allocation extends BaseObj { private void copyTo(Object array, Element.DataType dt, int arrayLen) { Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo"); + if (dt.mSize * arrayLen < mSize) { + throw new RSIllegalArgumentException( + "Size of output array cannot be smaller than size of allocation."); + } mRS.validate(); mRS.nAllocationRead(getID(mRS), array, dt); Trace.traceEnd(RenderScript.TRACE_TAG); |