Add minimum size check for ImageGrid atom (ef75163e) · Commits · e / os / android_frameworks_av

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];