Merge pull request #332 from WebPlatformForEmbedded/pstanek/mem-api-e…

…rror/1 [OCDM][ADAPTER] Do not pass invalid token to additional calls
rdkcentral · Feb 6, 2020 · 4552892 · 4552892
2 parents 4c5dd11 + 77d5c84
commit 4552892
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Source/ocdm/adapter/broadcom-svp/open_cdm_adapter.cpp b/Source/ocdm/adapter/broadcom-svp/open_cdm_adapter.cpp
@@ -142,12 +142,15 @@ OpenCDMError opencdm_gstreamer_session_decrypt(struct OpenCDMSession* session, G
         block = NEXUS_MemoryBlock_Clone (reinterpret_cast<NEXUS_MemoryBlockTokenHandle>(*tokenHandle));
         if (!block) {
             TRACE_L1("Memory token alloc error");
+            ::free(encryptedData);
+            goto exit;
         }
         ::free(encryptedData);
         void *opaqueData;
         NEXUS_MemoryBlock_Lock(block, &opaqueData);
         if (!opaqueData) {
             TRACE_L1("Memory token alloc error");
+            goto exit;
         }
 
         svpMeta->u.u3.secbuf_ptr = reinterpret_cast<uintptr_t>(opaqueData);