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

am 6637e307: am bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"

Browse Source 
* commit '6637e307494475b85afe8869d312d4a2f832d8f4':
  Fix for writing empty strings to Parcel::writeString8()
This commit is contained in:
Jean-Baptiste Queru 2010-12-28 11:54:08 -08:00 committed by Android Git Automerger
commit 1ee57e397f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/binder/Parcel.cpp
View File

@ -619,7 +619,10 @@ status_t Parcel::writeCString(const char* str)
status_t Parcel::writeString8(const String8& str) status_t Parcel::writeString8(const String8& str)
{ {
status_t err = writeInt32(str.bytes()); status_t err = writeInt32(str.bytes());
if (err == NO_ERROR) { // only write string if its length is more than zero characters,
// as readString8 will only read if the length field is non-zero.
// this is slightly different from how writeString16 works.
if (str.bytes() > 0 && err == NO_ERROR) {
err = write(str.string(), str.bytes()+1); err = write(str.string(), str.bytes()+1);
} }
return err; return err;