commit 67dff6f8918eb08105990c145ef7d948ed670a9b
author Jason Sams <jsams@google.com> Tue Jun 11 18:38:11 2013 -0700
committer The Android Automerger <android-build@android.com> Wed Jun 12 14:30:21 2013 -0700
tree 7aaca70b2711e9913c6fa32e8619dbb220154159
parent b5c1ba4fc36e08178bb1f54191ef0962926b6d23

Fix crash in Vine

bug 9272491

Legacy YUV formats could trigger null pointer using YUV intrinsic.

Change-Id: I2eca7254a22c757c50e302a190e9aa5c05437534

cpu_ref/rsCpuIntrinsicYuvToRGB.cpp

diff --git a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
index 3d989bd..939fbd5 100644
--- a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
+++ b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
@@ -132,6 +132,13 @@
             const size_t strideUV = cp->alloc->mHal.drvState.lod[1].stride;
             const uchar *uv = pinUV + ((p->y >> 1) * strideUV);
 
+            if (pinUV == NULL) {
+                // Legacy yuv support didn't fill in uv
+                uv = ((uint8_t *)cp->alloc->mHal.drvState.lod[0].mallocPtr) +
+                     (cp->alloc->mHal.drvState.lod[0].stride *
+                      cp->alloc->mHal.drvState.lod[0].dimY);
+            }
+
             if(x2 > x1) {
         #if defined(ARCH_ARM_HAVE_NEON)
                 int32_t len = (x2 - x1 - 1) >> 3;