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

Commit 215185d3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add minimum size check for ImageGrid atom" into oc-mr1-dev

parents a2481664 ef75163e

media/libstagefright/ItemTable.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,8 @@ status_t ItemTable::buildImageItemsIfPossible(uint32_t type) { 
        ALOGV("adding %s: itemId %d", image.isGrid() ? "grid" : "image", info.itemId);



        if (image.isGrid()) {

            if (size > 12) {

            // ImageGrid struct is at least 8-byte, at most 12-byte (if flags&1)

            if (size < 8 || size > 12) {

                return ERROR_MALFORMED;

            }

            uint8_t buf[12];