widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure terminate is called in all error cases

Browse Source 
bug: 18203007
Change-Id: I0d74b348982992075ec126a324dabbff8fab9125
This commit is contained in:
Jeff Tinker
2014-12-11 19:25:21 -08:00
parent 4dd748597a
commit 07478a67cb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
proprietary/wvm/WVMExtractorImpl.cpp
View File

@@ -204,17 +204,17 @@ void WVMExtractorImpl::Initialize()
if (mSetupStatus != OK) { if (mSetupStatus != OK) {
setError(mSetupStatus); setError(mSetupStatus);
#ifdef REQUIRE_SECURE_BUFFERS
if (mCryptoInitialized) {
OEMCrypto_Terminate();
}
#endif
} }
WV_SetWarningToErrorMS(10000); WV_SetWarningToErrorMS(10000);
} }
WVMExtractorImpl::~WVMExtractorImpl() { WVMExtractorImpl::~WVMExtractorImpl() {
#ifdef REQUIRE_SECURE_BUFFERS
if (mCryptoInitialized) {
OEMCrypto_Terminate();
}
#endif
} }
// Release decrypt handle when media sources are destroyed // Release decrypt handle when media sources are destroyed
@@ -383,6 +383,9 @@ status_t WVMExtractorImpl::readMetaData()
mVideoSource = new WVMMediaSource(mSession, WV_EsSelector_Video, videoMetaData, mVideoSource = new WVMMediaSource(mSession, WV_EsSelector_Video, videoMetaData,
mIsLiveStream, cryptoPluginMode, mCryptoInitialized); mIsLiveStream, cryptoPluginMode, mCryptoInitialized);
// responsibility for terminating has been delegated to WVMMediaSource
mCryptoInitialized = false;
// Since the WVExtractor goes away soon after this, we delegate ownership of some resources // Since the WVExtractor goes away soon after this, we delegate ownership of some resources
// to the constructed media source // to the constructed media source
if (mFileSource.get()) { if (mFileSource.get()) {