Merge "MediaCodec: check for exceptions when creating crypto info"

2023-01-12 01:45:26 +00:00
parent 891a1cc9fa 436998b020
commit 2f222457a2
1 changed files with 6 additions and 7 deletions
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2432,13 +2432,12 @@ static void android_media_MediaCodec_native_queueLinearBlock(
            throwExceptionAsNecessary(env, BAD_VALUE);
            return;
        }
-        NativeCryptoInfo cryptoInfo = [env, cryptoInfoObj, size]{
-            if (cryptoInfoObj == nullptr) {
-                return NativeCryptoInfo{size};
-            } else {
-                return NativeCryptoInfo{env, cryptoInfoObj};
-            }
-        }();
+        auto cryptoInfo =
+                cryptoInfoObj ? NativeCryptoInfo{size} : NativeCryptoInfo{env, cryptoInfoObj};
+        if (env->ExceptionCheck()) {
+            // Creation of cryptoInfo failed. Let the exception bubble up.
+            return;
+        }
        err = codec->queueEncryptedLinearBlock(
                index,
                memory,