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

Commit 0f71d1fd authored by panshuangquan's avatar panshuangquan Committed by android-build-merger
Browse files

Merge "fix potential mediaserver crash in ACodec::getPortFormat" 

am: c3f020b2

Change-Id: I735aca01f5d17041dd907c43cb043b61853d021f
parents cdab39a2 c3f020b2

media/libstagefright/ACodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4736,9 +4736,9 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
                            rect.nTop < 0 ||

                            rect.nLeft + rect.nWidth > videoDef->nFrameWidth ||

                            rect.nTop + rect.nHeight > videoDef->nFrameHeight) {

                            ALOGE("Wrong cropped rect (%d, %d) - (%u, %u) vs. frame (%u, %u)",

                            ALOGE("Wrong cropped rect (%d, %d, %u, %u) vs. frame (%u, %u)",

                                    rect.nLeft, rect.nTop,

                                    rect.nLeft + rect.nWidth, rect.nTop + rect.nHeight,

                                    rect.nWidth, rect.nHeight,

                                    videoDef->nFrameWidth, videoDef->nFrameHeight);

                            return BAD_VALUE;

                        }