commit 1ca821bf0e792f19b13a66b09366bdc7c869dd60
author Paul McLean <pmclean@google.com> Tue Apr 28 09:35:15 2020 -0600
committer Paul McLean <pmclean@google.com> Wed Apr 29 07:37:48 2020 -0600
tree d310fbb093dbf5b9f75c883e5fb34429bac67cb8
parent 3aad74264222f07b48d02cfc0afe53fd91786c99

Fixed crash (for double-delete) in unloadSampleData().

samples/iolib/src/main/cpp/player/SampleBuffer.cpp

diff --git a/samples/iolib/src/main/cpp/player/SampleBuffer.cpp b/samples/iolib/src/main/cpp/player/SampleBuffer.cpp
index 0f8faef..42078b6 100644
--- a/samples/iolib/src/main/cpp/player/SampleBuffer.cpp
+++ b/samples/iolib/src/main/cpp/player/SampleBuffer.cpp
@@ -34,7 +34,9 @@
 }
 
 void SampleBuffer::unloadSampleData() {
-    delete[] mSampleData;
+    if (mSampleData != nullptr) {
+        delete[] mSampleData;
+    }
     mNumSamples = 0;
 }
 

samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp

diff --git a/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp b/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp
index 4313668..b9a6859 100644
--- a/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp
+++ b/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp
@@ -142,8 +142,9 @@
 
 void SimpleMultiPlayer::unloadSampleData() {
     __android_log_print(ANDROID_LOG_INFO, TAG, "unloadSampleData()");
+    resetAll();
+
     for (int32_t bufferIndex = 0; bufferIndex < mNumSampleBuffers; bufferIndex++) {
-        mSampleBuffers[bufferIndex]->unloadSampleData();
         delete mSampleBuffers[bufferIndex];
         delete mSampleSources[bufferIndex];
     }