mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pa_parse_boolean() return value checking.

Browse source 
pa_parse_boolean() return value shouldn't be stored in
pa_bool_t, because 1 and -1 need to be distinguished.
This commit is contained in:
Tanu Kaskinen 2012-03-29 15:24:02 +03:00 • committed by Tanu Kaskinen
parent 188d037150
commit 19c058dd08
3 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/daemon/cmdline.c
View file

@ -170,6 +170,7 @@ void pa_cmdline_help(const char *argv0) {
int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d) { int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d) {
pa_strbuf *buf = NULL; pa_strbuf *buf = NULL;
int c; int c;
int b;
pa_assert(conf); pa_assert(conf);
pa_assert(argc > 0); pa_assert(argc > 0);
@ -240,17 +241,19 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
case ARG_DAEMONIZE: case ARG_DAEMONIZE:
case 'D': case 'D':
if ((conf->daemonize = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--daemonize expects boolean argument")); pa_log(_("--daemonize expects boolean argument"));
goto fail; goto fail;
} }
conf->daemonize = !!b;
break; break;
case ARG_FAIL: case ARG_FAIL:
if ((conf->fail = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--fail expects boolean argument")); pa_log(_("--fail expects boolean argument"));
goto fail; goto fail;
} }
conf->fail = !!b;
break; break;
case 'v': case 'v':
@ -269,38 +272,43 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
break; break;
case ARG_HIGH_PRIORITY: case ARG_HIGH_PRIORITY:
if ((conf->high_priority = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--high-priority expects boolean argument")); pa_log(_("--high-priority expects boolean argument"));
goto fail; goto fail;
} }
conf->high_priority = !!b;
break; break;
case ARG_REALTIME: case ARG_REALTIME:
if ((conf->realtime_scheduling = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--realtime expects boolean argument")); pa_log(_("--realtime expects boolean argument"));
goto fail; goto fail;
} }
conf->realtime_scheduling = !!b;
break; break;
case ARG_DISALLOW_MODULE_LOADING: case ARG_DISALLOW_MODULE_LOADING:
if ((conf->disallow_module_loading = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--disallow-module-loading expects boolean argument")); pa_log(_("--disallow-module-loading expects boolean argument"));
goto fail; goto fail;
} }
conf->disallow_module_loading = !!b;
break; break;
case ARG_DISALLOW_EXIT: case ARG_DISALLOW_EXIT:
if ((conf->disallow_exit = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--disallow-exit expects boolean argument")); pa_log(_("--disallow-exit expects boolean argument"));
goto fail; goto fail;
} }
conf->disallow_exit = !!b;
break; break;
case ARG_USE_PID_FILE: case ARG_USE_PID_FILE:
if ((conf->use_pid_file = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--use-pid-file expects boolean argument")); pa_log(_("--use-pid-file expects boolean argument"));
goto fail; goto fail;
} }
conf->use_pid_file = !!b;
break; break;
case 'p': case 'p':
@ -321,17 +329,19 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
break; break;
case ARG_LOG_TIME: case ARG_LOG_TIME:
if ((conf->log_time = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--log-time expects boolean argument")); pa_log(_("--log-time expects boolean argument"));
goto fail; goto fail;
} }
conf->log_time = !!b;
break; break;
case ARG_LOG_META: case ARG_LOG_META:
if ((conf->log_meta = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--log-meta expects boolean argument")); pa_log(_("--log-meta expects boolean argument"));
goto fail; goto fail;
} }
conf->log_meta = !!b;
break; break;
case ARG_LOG_BACKTRACE: case ARG_LOG_BACKTRACE:
@ -354,24 +364,27 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
break; break;
case ARG_SYSTEM: case ARG_SYSTEM:
if ((conf->system_instance = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--system expects boolean argument")); pa_log(_("--system expects boolean argument"));
goto fail; goto fail;
} }
conf->system_instance = !!b;
break; break;
case ARG_NO_CPU_LIMIT: case ARG_NO_CPU_LIMIT:
if ((conf->no_cpu_limit = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--no-cpu-limit expects boolean argument")); pa_log(_("--no-cpu-limit expects boolean argument"));
goto fail; goto fail;
} }
conf->no_cpu_limit = !!b;
break; break;
case ARG_DISABLE_SHM: case ARG_DISABLE_SHM:
if ((conf->disable_shm = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--disable-shm expects boolean argument")); pa_log(_("--disable-shm expects boolean argument"));
goto fail; goto fail;
} }
conf->disable_shm = !!b;
break; break;
default: default:

4
src/pulsecore/cli-command.c
View file

@ -1565,7 +1565,7 @@ static int pa_cli_command_log_level(pa_core *c, pa_tokenizer *t, pa_strbuf *buf,
static int pa_cli_command_log_meta(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) { static int pa_cli_command_log_meta(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) {
const char *m; const char *m;
pa_bool_t b; int b;
pa_core_assert_ref(c); pa_core_assert_ref(c);
pa_assert(t); pa_assert(t);
@ -1589,7 +1589,7 @@ static int pa_cli_command_log_meta(pa_core *c, pa_tokenizer *t, pa_strbuf *buf,
static int pa_cli_command_log_time(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) { static int pa_cli_command_log_time(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) {
const char *m; const char *m;
pa_bool_t b; int b;
pa_core_assert_ref(c); pa_core_assert_ref(c);
pa_assert(t); pa_assert(t);

18
src/utils/pactl.c
View file

@ -1622,6 +1622,8 @@ int main(int argc, char *argv[]) {
module_name = argv[optind + 1]; module_name = argv[optind + 1];
} else if (pa_streq(argv[optind], "suspend-sink")) { } else if (pa_streq(argv[optind], "suspend-sink")) {
int b;
action = SUSPEND_SINK; action = SUSPEND_SINK;
if (argc > optind+3 || optind+1 >= argc) { if (argc > optind+3 || optind+1 >= argc) {
@ -1629,12 +1631,19 @@ int main(int argc, char *argv[]) {
goto quit; goto quit;
} }
suspend = pa_parse_boolean(argv[argc-1]); if ((b = pa_parse_boolean(argv[argc-1])) < 0) {
pa_log(_("Invalid suspend specification."));
goto quit;
}
suspend = !!b;
if (argc > optind+2) if (argc > optind+2)
sink_name = pa_xstrdup(argv[optind+1]); sink_name = pa_xstrdup(argv[optind+1]);
} else if (pa_streq(argv[optind], "suspend-source")) { } else if (pa_streq(argv[optind], "suspend-source")) {
int b;
action = SUSPEND_SOURCE; action = SUSPEND_SOURCE;
if (argc > optind+3 || optind+1 >= argc) { if (argc > optind+3 || optind+1 >= argc) {
@ -1642,7 +1651,12 @@ int main(int argc, char *argv[]) {
goto quit; goto quit;
} }
suspend = pa_parse_boolean(argv[argc-1]); if ((b = pa_parse_boolean(argv[argc-1])) < 0) {
pa_log(_("Invalid suspend specification."));
goto quit;
}
suspend = !!b;
if (argc > optind+2) if (argc > optind+2)
source_name = pa_xstrdup(argv[optind+1]); source_name = pa_xstrdup(argv[optind+1]);