Merge "MediaExtractor: Fix use-after-free"

7 years ago · 4e3815d14d
parent 200149a393 2b22e70838
commit 4e3815d14d
1 changed files with 2 additions and 1 deletions
--- a/media/libstagefright/MediaExtractorFactory.cpp
+++ b/media/libstagefright/MediaExtractorFactory.cpp
@ -252,7 +252,8 @@ void MediaExtractorFactory::RegisterExtractorsInApk(
    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);