From 8afa1c4ab86d724feb7716e153b7835385534590 Mon Sep 17 00:00:00 2001
From: Michael Lentine <mlentine@google.com>
Date: Fri, 31 Oct 2014 11:10:13 -0700
Subject: Fix crash when user provides large values in the Parcel.

Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
---
 libs/gui/LayerState.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'libs/gui/LayerState.cpp')

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index e95d8b6c42..1183d59215 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -55,8 +55,12 @@ status_t layer_state_t::read(const Parcel& input)
     alpha = input.readFloat();
     flags = input.readInt32();
     mask = input.readInt32();
-    matrix = *reinterpret_cast<layer_state_t::matrix22_t const *>(
-            input.readInplace(sizeof(layer_state_t::matrix22_t)));
+    const void* matrix_data = input.readInplace(sizeof(layer_state_t::matrix22_t));
+    if (matrix_data) {
+        matrix = *reinterpret_cast<layer_state_t::matrix22_t const *>(matrix_data);
+    } else {
+        return BAD_VALUE;
+    }
     input.read(crop);
     input.read(transparentRegion);
     return NO_ERROR;
-- 
cgit v1.2.3-59-g8ed1b