Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbc6c7a6 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix uninitialized crypto pattern" into nyc-dev am: e883f6c2 

am: 47f95b9c

* commit '47f95b9c':
  Fix uninitialized crypto pattern
parents c7da972a 47f95b9c

media/jni/android_media_MediaCodec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1302,7 +1302,10 @@ static void android_media_MediaCodec_queueSecureInputBuffer( 
    jobject patternObj = env->GetObjectField(cryptoInfoObj, gFields.cryptoInfoPatternID);



    CryptoPlugin::Pattern pattern;

    if (patternObj != NULL) {

    if (patternObj == NULL) {

        pattern.mEncryptBlocks = 0;

        pattern.mSkipBlocks = 0;

    } else {

        pattern.mEncryptBlocks = env->GetIntField(patternObj, gFields.patternEncryptBlocksID);

        pattern.mSkipBlocks = env->GetIntField(patternObj, gFields.patternSkipBlocksID);

    }