Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 295d9b1d authored by Yi Jin's avatar Yi Jin
Browse files

Fix the tag size in token of ProtoOutputStream.cpp, the java version has 

the correct tag size computed.

Bug: 72755317
Test: incident -p A 3005 | aprotoc --decode_raw
Change-Id: I0275dbecb566101b562b649c2ae3d58fbfb9188b
parent 7902b4a1

libs/protoutil/src/ProtoOutputStream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -249,15 +249,15 @@ ProtoOutputStream::start(uint64_t fieldId) 
    }



    uint32_t id = (uint32_t)fieldId;

    size_t prevPos = mBuffer.wp()->pos();

    mBuffer.writeHeader(id, WIRE_TYPE_LENGTH_DELIMITED);



    size_t sizePos = mBuffer.wp()->pos();



    mDepth++;

    mObjectId++;

    mBuffer.writeRawFixed64(mExpectedObjectToken); // push previous token into stack.



    mExpectedObjectToken = makeToken(get_varint_size(id),

    mExpectedObjectToken = makeToken(sizePos - prevPos,

        (bool)(fieldId & FIELD_COUNT_REPEATED), mDepth, mObjectId, sizePos);

    return mExpectedObjectToken;

}