Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bfb5f5966b36c4960b56f6de10ba261332208db9':
  Fix for writing empty strings to Parcel::writeString8()
This commit is contained in:
Jean-Baptiste Queru
2010-12-28 11:39:21 -08:00
committed by Android Git Automerger
parent e90a1b16a3 bfb5f5966b
commit 6637e30749
1 changed files with 4 additions and 1 deletions
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 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);
}
return err;