openharmony/third_party_tinyalsa
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_tinyalsa.git synced 2026-07-19 15:24:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

tinymix: don't get byte array if size is zero

Browse Source 
Fixes an error if the number of bytes available is zero.

Also remove unused len variable.
This commit is contained in:
Simon Wilson
2016-01-09 10:26:57 -08:00
parent 1f8145a46a
commit d131cf241b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tinymix.c
+2 -5
View File
@@ -132,7 +132,6 @@ static void tinymix_detail_control(struct mixer *mixer, const char *control,
int min, max;
int ret;
char *buf = NULL;
size_t len;
if (isdigit(control[0]))
ctl = mixer_get_ctl(mixer, atoi(control));
@@ -147,16 +146,14 @@ static void tinymix_detail_control(struct mixer *mixer, const char *control,
type = mixer_ctl_get_type(ctl);
num_values = mixer_ctl_get_num_values(ctl);
if (type == MIXER_CTL_TYPE_BYTE) {
if ((type == MIXER_CTL_TYPE_BYTE) && (num_values > 0)) {
buf = calloc(1, num_values);
if (buf == NULL) {
fprintf(stderr, "Failed to alloc mem for bytes %d\n", num_values);
return;
}
len = num_values;
ret = mixer_ctl_get_array(ctl, buf, len);
ret = mixer_ctl_get_array(ctl, buf, num_values);
if (ret < 0) {
fprintf(stderr, "Failed to mixer_ctl_get_array\n");
free(buf);