ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure Parcel handles 0-sized LightFlatenables

Browse Source 
Change-Id: Ib30a1c0228f8a938abaa0c7c8a6ba32ffd971121
This commit is contained in:
Mathias Agopian 2012-08-31 14:25:22 -07:00
parent 8210185fe3
commit 2098517e3e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/binder/Parcel.h
View File

@ -285,9 +285,12 @@ status_t Parcel::write(const LightFlattenable<T>& val) {
return err;
}
}
void* buffer = writeInplace(size);
return buffer == NULL ? NO_MEMORY :
val.flatten(buffer);
if (size) {
void* buffer = writeInplace(size);
return buffer == NULL ? NO_MEMORY :
val.flatten(buffer);
}
return NO_ERROR;
}
template<typename T>
@ -303,9 +306,12 @@ status_t Parcel::read(LightFlattenable<T>& val) const {
}
size = s;
}
void const* buffer = readInplace(size);
return buffer == NULL ? NO_MEMORY :
val.unflatten(buffer, size);
if (size) {
void const* buffer = readInplace(size);
return buffer == NULL ? NO_MEMORY :
val.unflatten(buffer, size);
}
return NO_ERROR;
}
// ---------------------------------------------------------------------------