| commit | 1344052273077c8a0dc4a69c01bcaf25b3e8067f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Nov 07 01:46:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 07 01:46:27 2023 +0000 |
| tree | 467d55c25ebdb0a7fd3411e2df628be1819dfe28 | |
| parent | c57c590e4465a7a71cd8f258798e62a66b568c34 [diff] | |
| parent | c851dba908055e5c9a2bc46e920374b506d7eac3 [diff] |
Merge "Validate IAfEffectHandle before access virtual methods" into main am: c851dba908 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2819061 Change-Id: Ie79e4238e1db034e9f75c3d66dfe86f29623d34e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 741260e..fa118c3 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp
@@ -4270,7 +4270,7 @@ response->id = idOut; response->enabled = enabledOut != 0; - response->effect = handle->asIEffect(); + response->effect = handle.get() ? handle->asIEffect() : nullptr; response->desc = VALUE_OR_RETURN_STATUS( legacy2aidl_effect_descriptor_t_EffectDescriptor(descOut));