Skip to content

Commit bfb5f59

Browse files
Jean-Baptiste QueruAndroid Code Review
authored andcommitted
Merge "Fix for writing empty strings to Parcel::writeString8()"
2 parents 752942e + b803c04 commit bfb5f59

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

libs/binder/Parcel.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,10 @@ status_t Parcel::writeCString(const char* str)
619619
status_t Parcel::writeString8(const String8& str)
620620
{
621621
status_t err = writeInt32(str.bytes());
622-
if (err == NO_ERROR) {
622+
// only write string if its length is more than zero characters,
623+
// as readString8 will only read if the length field is non-zero.
624+
// this is slightly different from how writeString16 works.
625+
if (str.bytes() > 0 && err == NO_ERROR) {
623626
err = write(str.string(), str.bytes()+1);
624627
}
625628
return err;

0 commit comments

Comments
 (0)