From d66ef45e09272b85a79c8d3c87666f26269bfa68 Mon Sep 17 00:00:00 2001
From: Ronghua Wu <ronghuawu@google.com>
Date: Wed, 27 May 2015 09:46:44 -0700
Subject: libmedia: read from parcel only when there's a data available.

Bug: 21374704
Change-Id: I87dc2ee36fe8db99cceeb25ec6657feb423de133
---
 media/libmedia/IResourceManagerService.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/libmedia/IResourceManagerService.cpp b/media/libmedia/IResourceManagerService.cpp
index 7cb0f79..6902e99 100644
--- a/media/libmedia/IResourceManagerService.cpp
+++ b/media/libmedia/IResourceManagerService.cpp
@@ -48,7 +48,7 @@ static void writeToParcel(Parcel *data, const Vector<T> &items) {
 template <typename T>
 static void readFromParcel(const Parcel &data, Vector<T> *items) {
     size_t size = (size_t)data.readUint32();
-    for (size_t i = 0; i < size; i++) {
+    for (size_t i = 0; i < size && data.dataAvail() > 0; i++) {
         T item;
         item.readFromParcel(data);
         items->add(item);
-- 
cgit v1.1