[alsa-devel] [alsa-lib][PATCH] control: correct assertion in snd_ctl_elem_set_bytes()

Takashi Sakamoto o-takashi at sakamocchi.jp
Sun Feb 21 17:54:09 CET 2016


The assert(3) aborts running process when expression arguments is
false (zero). Although, the snd_ctl_elem_set_bytes() has return
statement after assert(3). It has meaningless.

This commit corrects the statements.

Fixes: 7893ea238d5a('Added mode argument to open functions where it was missing. First part of CTL documentation')
Signed-off-by: Takashi Sakamoto <o-takashi at sakamocchi.jp>
---
 src/control/control.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/control/control.c b/src/control/control.c
index 328920d..70d168d 100644
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -2627,10 +2627,7 @@ void snd_ctl_elem_value_set_byte(snd_ctl_elem_value_t *obj, unsigned int idx, un
 void snd_ctl_elem_set_bytes(snd_ctl_elem_value_t *obj, void *data, size_t size)
 {
 	assert(obj);
-	if (size >= ARRAY_SIZE(obj->value.bytes.data)) {
-		assert(0);
-		return;
-	}
+	assert(size < ARRAY_SIZE(obj->value.bytes.data));
 	memcpy(obj->value.bytes.data, data, size);
 }
 
-- 
2.5.0



More information about the Alsa-devel mailing list