commit 4e3815d14dceaf31d60ea325e650be4db17ce6c3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 23 01:53:20 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 23 01:53:20 2018 +0000
tree b8912a672e775739176db329c2b80ddeb95067f5
parent 200149a393eb12c5a339510238efefb296116f9f
parent 2b22e7083877778100b7e25b375842b23d14e701

Merge "MediaExtractor: Fix use-after-free"

media/libstagefright/MediaExtractorFactory.cpp

diff --git a/media/libstagefright/MediaExtractorFactory.cpp b/media/libstagefright/MediaExtractorFactory.cpp
index 35e0665..078c646 100644
--- a/media/libstagefright/MediaExtractorFactory.cpp
+++ b/media/libstagefright/MediaExtractorFactory.cpp
@@ -252,7 +252,8 @@
     if (ret == 0) {
         char abi[PROPERTY_VALUE_MAX];
         property_get("ro.product.cpu.abi", abi, "arm64-v8a");
-        ZipString prefix(String8::format("lib/%s/", abi).c_str());
+        String8 prefix8 = String8::format("lib/%s/", abi);
+        ZipString prefix(prefix8.c_str());
         ZipString suffix("extractor.so");
         void* cookie;
         ret = StartIteration(zipHandle, &cookie, &prefix, &suffix);