aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Li <dvdli@google.com>2022-05-17 03:51:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-17 03:51:12 +0000
commit5149763e0af494101c865e2c7045b6967ac5f88f (patch)
treebb6dfed17142315e92d51c1e5c81bb06c3addeae
parentdad8902e596378190484937e973297fd2ba95f4f (diff)
parentbf44993ec7199f03c0fcf560a4cf434be1691dcc (diff)
downloadtinyalsa-5149763e0af494101c865e2c7045b6967ac5f88f.tar.gz
Merge "add null check for name in mixer_get_ctl_by_name" am: 782c1a059f am: bf44993ec7
Original change: https://android-review.googlesource.com/c/platform/external/tinyalsa/+/2098870 Change-Id: Ib0bb3bc602ab5e57f4687383c49be56cfc8351cc 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);