Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaMetadataRetriever: Fix null pointer exception"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-12 02:14:45 +00:00
committed by Android (Google) Code Review
parent e5ade59a8c a77c8dff43
commit 7e05d5ef24
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/jni/android_media_MediaMetadataRetriever.cpp
View File

@@ -464,11 +464,13 @@ static jobject android_media_MediaMetadataRetriever_getThumbnailImageAtIndex(
|| thumbPixels * 6 >= maxPixels) {
frameMemory = retriever->getImageAtIndex(
index, colorFormat, false /*metaOnly*/, true /*thumbnail*/);
// TODO: Using unsecurePointer() has some associated security pitfalls
// (see declaration for details).
// Either document why it is safe in this case or address the
// issue (e.g. by copying).
videoFrame = static_cast<VideoFrame *>(frameMemory->unsecurePointer());
if (frameMemory != 0) {
// TODO: Using unsecurePointer() has some associated security pitfalls
// (see declaration for details).
// Either document why it is safe in this case or address the
// issue (e.g. by copying).
videoFrame = static_cast<VideoFrame *>(frameMemory->unsecurePointer());
}
if (thumbPixels > maxPixels) {
int downscale = ceil(sqrt(thumbPixels / (float)maxPixels));