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

Commit 55deee70 authored by shaohongsheng's avatar shaohongsheng Committed by android-build-merger
Browse files

Merge "SampleIterator: fix sizeof bug in getSampleSizeDirect."

am: d31b6e37

Change-Id: I633c0fcd3cfda2100c20e4e076fbf4ec338551b0
parents 1f1584af d31b6e37
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -244,13 +244,14 @@ status_t SampleIterator::getSampleSizeDirect(
    switch (mTable->mSampleSizeFieldSize) {
        case 32:
        {
            uint32_t x;
            if (mTable->mDataSource->readAt(
                        mTable->mSampleSizeOffset + 12 + 4 * sampleIndex,
                        size, sizeof(*size)) < (ssize_t)sizeof(*size)) {
                        &x, sizeof(x)) < (ssize_t)sizeof(x)) {
                return ERROR_IO;
            }

            *size = ntohl(*size);
            *size = ntohl(x);
            break;
        }