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

tinymix: fix segfaults with set command

Browse Source 
The arguments passed after the set command are not handled properly,
leading to segfaults or inability to set controls

Example with control 0 which is Headset Volume on my NUC:

before fix
$ ./tinymix set 0
Segmentation fault
$ ./tinymix set 0 10
Segmentation fault
$ ./tinymix set 0 10 20
Error: 3 values given, but control only takes 2

After correction
$ ./tinymix set 0
no value(s) specified
$ ./tinymix set 0 10
$ ./tinymix set 0 10 10
$ ./tinymix set 0 10 10 10
Error: 3 values given, but control only takes 2

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This commit is contained in:
Pierre-Louis Bossart
2017-01-19 15:06:29 -06:00
parent 04fa39f287
commit a6947c624c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/tinymix.c
+6 -1
View File
@@ -124,7 +124,12 @@ int main(int argc, char **argv)
mixer_close(mixer);
return EXIT_FAILURE;
}
tinymix_set_value(mixer, argv[optind + 1], &argv[optind + 2], argc - 2);
if ((optind + 2) >= argc) {
fprintf(stderr, "no value(s) specified\n");
mixer_close(mixer);
return EXIT_FAILURE;
}
tinymix_set_value(mixer, argv[optind + 1], &argv[optind + 2], argc - 3);
} else if (strcmp(cmd, "controls") == 0) {
tinymix_list_controls(mixer, 0);
} else if (strcmp(cmd, "contents") == 0) {