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

Commit 300cd21e authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Fix out-of-bounds write am: 5403587a am: fb2eb861 am: e6bd186c am:...

Fix out-of-bounds write am: 5403587a am: fb2eb861 am: e6bd186c am: a8ac8f61 am: e2e46f5f am: 2304c606 am: 09451990 am: a39f9818 am: e463301a am: 0dd00d9b
am: 827e1208

* commit '827e1208':
  Fix out-of-bounds write
parents 6af4ec57 827e1208
Loading
Loading
Loading
Loading
+9 −1
Original line number Original line Diff line number Diff line
@@ -4545,7 +4545,15 @@ status_t MPEG4Source::fragmentedRead(
                    continue;
                    continue;
                }
                }


                CHECK(dstOffset + 4 <= mBuffer->size());
                if (dstOffset > SIZE_MAX - 4 ||
                        dstOffset + 4 > SIZE_MAX - nalLength ||
                        dstOffset + 4 + nalLength > mBuffer->size()) {
                    ALOGE("b/26365349 : %zu %zu", dstOffset, mBuffer->size());
                    android_errorWriteLog(0x534e4554, "26365349");
                    mBuffer->release();
                    mBuffer = NULL;
                    return ERROR_MALFORMED;
                }


                dstData[dstOffset++] = 0;
                dstData[dstOffset++] = 0;
                dstData[dstOffset++] = 0;
                dstData[dstOffset++] = 0;