diff options
| author | Rios Kao <rioskao@google.com> | 2020-10-19 09:08:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-19 09:08:13 +0000 |
| commit | 36ed41b03828066d15e42433b72907676bab082f (patch) | |
| tree | 8908c27fbb55eb99f616b4c9c5ba11e2dcdbad9f | |
| parent | 86314203d4c62cf53e5dcbeb795db7121924c1f9 (diff) | |
| parent | 7db6baa1a75ddef0e98891390bc6927e4da110e0 (diff) | |
| download | sound_trigger_hal-36ed41b03828066d15e42433b72907676bab082f.tar.gz | |
Merge "sthal: prevent double free the inactive model" into rvc-qpr-dev am: 7db6baa1a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/12853518
Change-Id: I1abcefabd5cf1fddda02147a4efee7d3a0c0dfc6
| -rw-r--r-- | sound_trigger_hw_iaxxx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound_trigger_hw_iaxxx.c b/sound_trigger_hw_iaxxx.c index fbbfa79..e3d34ff 100644 --- a/sound_trigger_hw_iaxxx.c +++ b/sound_trigger_hw_iaxxx.c @@ -2632,6 +2632,10 @@ static int stop_recognition(struct knowles_sound_trigger_device *stdev, model->is_active = false; goto exit; } + if (model->is_active == false) { + ALOGW("%s: the model was disabled already", __func__); + goto exit; + } if (stdev->adnc_strm_handle[handle] != 0) { ALOGD("%s: stop tunnling for index:%d", __func__, handle); |