diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-09-08 22:04:48 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-09-08 22:08:22 +0200 |
commit | 76b9cae026bf73a00ccf3ec8833ec56f0e64f451 (patch) | |
tree | 1aecfe7d7fb3f213c4117c129fe14170f8fffaf4 /src/topology | |
parent | 03d6b15291e3534afb72c5aa36495a932ef0cc6a (diff) | |
download | alsa-lib-76b9cae026bf73a00ccf3ec8833ec56f0e64f451.tar.gz |
topology: builder: Fix possibly uninitialized variable in write_elem_block()
When an empty list is passed to write_elem_block(), it may leave
vendor_type uninitialized.
builder.c: In function ‘write_elem_block’:
builder.c:127:8: warning: ‘vendor_type’ may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = write_block_header(tplg, tplg_type, vendor_type,
^
builder.c:114:33: note: ‘vendor_type’ was declared here
int ret, wsize = 0, count = 0, vendor_type;
^
Add an immediate return for count = 0 for avoiding it, and simplify
the code initializing vendor_type without using a one-shot loop.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'src/topology')
-rw-r--r-- | src/topology/builder.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/topology/builder.c b/src/topology/builder.c index 3bccd448..91412aad 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -116,13 +116,12 @@ static int write_elem_block(snd_tplg_t *tplg, /* count number of elements */ list_for_each(pos, base) count++; + if (!count) + return 0; /* write the header for this block */ - list_for_each(pos, base) { - elem = list_entry(pos, struct tplg_elem, list); - vendor_type = elem->vendor_type; - break; - } + elem = list_entry(base->next, struct tplg_elem, list); + vendor_type = elem->vendor_type; ret = write_block_header(tplg, tplg_type, vendor_type, SND_SOC_TPLG_ABI_VERSION, 0, size, count); |