commit 05dc618e486293eda4bc39eeca9f6a4721cca2b6
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Feb 04 13:30:14 2015 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Feb 04 13:34:20 2015 -0800
tree dd5f5f59b3ef4e3a4eb90739a7d72e4e8c8f7f69
parent c2ae15c4fbde28e92f898b488f514d614497628e

CameraITS: prevent reading past last pixel of image

Bug: 17906609
Change-Id: Ieef201ae3c7ef5dcb1da39796fb584f3bd553464

apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
index 2541142..2011314 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
@@ -166,7 +166,9 @@
                         int length = w * bytesPerPixel;
                         buffer.get(data, offset, length);
                         // Advance buffer the remainder of the row stride
-                        buffer.position(buffer.position() + rowStride - length);
+                        if (row < h - 1) {
+                            buffer.position(buffer.position() + rowStride - length);
+                        }
                         offset += length;
                     } else {
                         // Generic case: should work for any pixelStride but slower.