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

Commit 7cc4f785 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "Safe parsing of HEIF framecount information"

parents 1347885d e89e632f

media/libheif/HeifDecoderImpl.cpp

+8 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <binder/IMemory.h>

#include <binder/MemoryDealer.h>

#include <drm/drm_framework_common.h>

#include <log/log.h>

#include <media/mediametadataretriever.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -422,7 +423,13 @@ bool HeifDecoderImpl::reinit(HeifFrameInfo* frameInfo) { 


        initFrameInfo(&mSequenceInfo, videoFrame);



        mSequenceLength = atoi(mRetriever->extractMetadata(METADATA_KEY_VIDEO_FRAME_COUNT));

        const char* frameCount = mRetriever->extractMetadata(METADATA_KEY_VIDEO_FRAME_COUNT);

        if (frameCount == nullptr) {

            android_errorWriteWithInfoLog(0x534e4554, "215002587", -1, NULL, 0);

            ALOGD("No valid sequence information in metadata");

            return false;

        }

        mSequenceLength = atoi(frameCount);



        if (defaultInfo == nullptr) {

            defaultInfo = &mSequenceInfo;