commit ce01b72e3a01c973a00f970a2b8eb0d313852bf0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 28 06:59:45 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 28 06:59:45 2022 +0000
tree 99fff0f33aed351822dd49838f6ae6c57ed3828d
parent 2ba33e9a3908233f4729837887d947d53fba0b31
parent 593a4bc5e536179c582fa7c05b9f49e0bc149a9b

Merge "Fix use-after-free in AMediaExtractor_getSampleCryptoInfo" into tm-dev

media/ndk/NdkMediaExtractor.cpp

diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp
index 07fc5de..6d3c348 100644
--- a/media/ndk/NdkMediaExtractor.cpp
+++ b/media/ndk/NdkMediaExtractor.cpp
@@ -388,9 +388,11 @@
         mode = CryptoPlugin::kMode_AES_CTR;
     }
 
+    sp<ABuffer> clearbuf;
+    sp<ABuffer> cryptedbuf;
     if (sizeof(uint32_t) != sizeof(size_t)) {
-        sp<ABuffer> clearbuf   = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)cleardata);
-        sp<ABuffer> cryptedbuf = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)crypteddata);
+        clearbuf   = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)cleardata);
+        cryptedbuf = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)crypteddata);
         cleardata   = clearbuf    == NULL ? NULL : clearbuf->data();
         crypteddata = crypteddata == NULL ? NULL : cryptedbuf->data();
         if(crypteddata == NULL || cleardata == NULL) {