summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IResourceManagerService.cpp
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-05-27 09:46:44 -0700
committerRonghua Wu <ronghuawu@google.com>2015-05-27 09:46:44 -0700
commitd66ef45e09272b85a79c8d3c87666f26269bfa68 (patch)
tree6368ad7540c78ad8491c6835327058075c76ba2c /media/libmedia/IResourceManagerService.cpp
parent6374077319a2d060eefe5f4bf425aed37f90c5d0 (diff)
downloadframeworks_av-d66ef45e09272b85a79c8d3c87666f26269bfa68.zip
frameworks_av-d66ef45e09272b85a79c8d3c87666f26269bfa68.tar.gz
frameworks_av-d66ef45e09272b85a79c8d3c87666f26269bfa68.tar.bz2
libmedia: read from parcel only when there's a data available.
Bug: 21374704 Change-Id: I87dc2ee36fe8db99cceeb25ec6657feb423de133
Diffstat (limited to 'media/libmedia/IResourceManagerService.cpp')
-rw-r--r--media/libmedia/IResourceManagerService.cpp2
1 files changed, 1 insertions, 1 deletions
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);