commit b636524376b7620926fdb64751bfa9b28e362593
author Greg Kaiser <gkaiser@google.com> Thu Aug 11 11:01:37 2016 -0700
committer Greg Kaiser <gkaiser@google.com> Thu Aug 11 11:01:37 2016 -0700
tree 9e2e0161d6cba8a0e2ceffdb3fd782ba4c6e4ad5
parent 7c5593b35fa51fe78d4e7b6e12e60424c5da8a90

DrmListener: Don't leak memory in error case.

Change-Id: If4dc869e468f52997be732d03dc010f89551cd87

media/ndk/NdkMediaDrm.cpp

diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
index be71f43..8d34ab0 100644
--- a/media/ndk/NdkMediaDrm.cpp
+++ b/media/ndk/NdkMediaDrm.cpp
@@ -99,11 +99,12 @@
             break;
         default:
             ALOGE("Invalid event DrmPlugin::EventType %d, ignored", (int)eventType);
-            return;
+            goto cleanup;
     }
 
     (*mListener)(mObj, &sessionId, ndkEventType, extra, data, dataSize);
 
+ cleanup:
     delete [] sessionId.ptr;
     delete [] data;
 }