Skip to content

Commit b803c04

Browse files
Pravat DalbeheraJohan Redestig
authored andcommitted
Fix for writing empty strings to Parcel::writeString8()
If writeString8 is called with the following sequence: writeString8(String8("")); writeString8(String8("TempString")); Then in the readString8, the 2nd String i.e. "TempString" is not read, instead an empty string is read. The bug comes because of the write call for String8("") where there are no String bytes present. In the write Statement, an extra ‘\0’ is written. During the Marshalling, Following bytes are written: 1 2 3 4 5 ... 0x0 0x0 0xB ‘T’ ‘e’ ... The readString8 function has a check that, if String length is 0, don’t read anything. So the first byte is read as the length for the first string. The second byte i.e. ‘\0’ is read as the length for the second string and hence the second string becomes empty too. Change-Id: Id7acc0c80ae16e77be4331f1ddf69ea87e758420
1 parent e78a000 commit b803c04

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)