aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Li <dvdli@google.com>2022-05-17 05:22:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-17 05:22:59 +0000
commit88fcff8c79ce505710b3918fb6c3a9191fa39053 (patch)
treebb6dfed17142315e92d51c1e5c81bb06c3addeae
parentd9fba6facf65fbeb69344dcd5f57849b9920b180 (diff)
parentf9af7f4010191771cc331543b8d0709772b0d097 (diff)
downloadtinyalsa-88fcff8c79ce505710b3918fb6c3a9191fa39053.tar.gz
Merge "add null check for name in mixer_get_ctl_by_name" am: 782c1a059f am: bf44993ec7 am: 5149763e0a am: 5add07a1b0 am: f9af7f4010
Original change: https://android-review.googlesource.com/c/platform/external/tinyalsa/+/2098870 Change-Id: Ib2bae58960eacee5a04bf938115102305f60b142 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--mixer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mixer.c b/mixer.c
index fd0ad8d..506e0ef 100644
--- a/mixer.c
+++ b/mixer.c
@@ -388,7 +388,7 @@ struct mixer_ctl *mixer_get_ctl_by_name(struct mixer *mixer, const char *name)
unsigned int n;
int hw_ctl_count;
- if (!mixer)
+ if (!mixer || !name)
return NULL;
hw_ctl_count = mixer_grp_get_count(mixer->hw_grp);