Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix uninitialized crypto pattern" into nyc-dev

Browse Source
This commit is contained in:
Jeff Tinker
2016-03-04 01:35:52 +00:00
committed by Android (Google) Code Review
parent a8242fa442 e872ac45f7
commit e883f6c299
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_MediaCodec.cpp
View File

@@ -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);
}