Skip to content

Validate CLI seed and server port arguments #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FabioMalpezzi wants to merge 1 commit into
base: main
Choose a base branch
from
+39 −13
Open

Validate CLI seed and server port arguments #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ds4_agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,11 +388,16 @@ static bool parse_power_percent(const char *arg, int *out) {
return true;
}

static uint64_t parse_u64(const char *s, const char *opt) {
static uint64_t parse_seed(const char *s) {
char *end = NULL;
if (s[0] == '\0' || s[0] == '-') {
fprintf(stderr, "ds4-agent: invalid value for --seed: %s\n", s);
exit(2);
}
errno = 0;
unsigned long long v = strtoull(s, &end, 10);
if (s[0] == '\0' || *end != '\0' || v == 0) {
fprintf(stderr, "ds4-agent: invalid value for %s: %s\n", opt, s);
if (*end != '\0' || errno == ERANGE || v == 0) {
fprintf(stderr, "ds4-agent: invalid value for --seed: %s\n", s);
exit(2);
}
return (uint64_t)v;
Expand Down Expand Up @@ -541,7 +546,7 @@ static agent_config parse_options(int argc, char **argv) {
} else if (!strcmp(arg, "--min-p")) {
c.gen.min_p = parse_float_range(need_arg(&i, argc, argv, arg), arg, 0.0f, 1.0f);
} else if (!strcmp(arg, "--seed")) {
c.gen.seed = parse_u64(need_arg(&i, argc, argv, arg), arg);
c.gen.seed = parse_seed(need_arg(&i, argc, argv, arg));
} else if (!strcmp(arg, "--think")) {
c.gen.think_mode = DS4_THINK_HIGH;
} else if (!strcmp(arg, "--think-max")) {
Expand Down
13 changes: 9 additions & 4 deletions ds4_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,16 @@ static int parse_int(const char *s, const char *opt) {
return (int)v;
}

static uint64_t parse_u64(const char *s, const char *opt) {
static uint64_t parse_seed(const char *s) {
char *end = NULL;
if (s[0] == '\0' || s[0] == '-') {
fprintf(stderr, "ds4: invalid value for --seed: %s\n", s);
exit(2);
}
errno = 0;
unsigned long long v = strtoull(s, &end, 10);
if (s[0] == '\0' || *end != '\0' || v == 0) {
fprintf(stderr, "ds4: invalid value for %s: %s\n", opt, s);
if (*end != '\0' || errno == ERANGE || v == 0) {
fprintf(stderr, "ds4: invalid value for --seed: %s\n", s);
exit(2);
}
return (uint64_t)v;
Expand Down Expand Up @@ -1444,7 +1449,7 @@ static cli_config parse_options(int argc, char **argv) {
} else if (!strcmp(arg, "--min-p")) {
c.gen.min_p = parse_float_range(need_arg(&i, argc, argv, arg), arg, 0.0f, 1.0f);
} else if (!strcmp(arg, "--seed")) {
c.gen.seed = parse_u64(need_arg(&i, argc, argv, arg), arg);
c.gen.seed = parse_seed(need_arg(&i, argc, argv, arg));
} else if (!strcmp(arg, "--quality")) {
c.engine.quality = true;
} else if (!strcmp(arg, "--power")) {
Expand Down
13 changes: 9 additions & 4 deletions ds4_eval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,11 +1429,16 @@ static int parse_int_arg(const char *s, const char *opt) {
return (int)v;
}

static uint64_t parse_u64_arg(const char *s, const char *opt) {
static uint64_t parse_seed_arg(const char *s) {
char *end = NULL;
if (s[0] == '\0' || s[0] == '-') {
fprintf(stderr, "ds4-eval: invalid value for --seed: %s\n", s);
exit(2);
}
errno = 0;
unsigned long long v = strtoull(s, &end, 10);
if (s[0] == '\0' || *end != '\0' || v == 0) {
fprintf(stderr, "ds4-eval: invalid value for %s: %s\n", opt, s);
if (*end != '\0' || errno == ERANGE || v == 0) {
fprintf(stderr, "ds4-eval: invalid value for --seed: %s\n", s);
exit(2);
}
return (uint64_t)v;
Expand Down Expand Up @@ -1556,7 +1561,7 @@ static eval_config parse_options(int argc, char **argv) {
} else if (!strcmp(arg, "--min-p")) {
c.min_p = parse_float_arg(need_arg(&i, argc, argv, arg), arg, 0.0f, 1.0f);
} else if (!strcmp(arg, "--seed")) {
c.seed = parse_u64_arg(need_arg(&i, argc, argv, arg), arg);
c.seed = parse_seed_arg(need_arg(&i, argc, argv, arg));
} else if (!strcmp(arg, "--trace")) {
c.trace_path = need_arg(&i, argc, argv, arg);
} else if (!strcmp(arg, "--regrade-trace")) {
Expand Down
13 changes: 12 additions & 1 deletion ds4_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11235,6 +11235,17 @@ static int parse_nonneg_int_arg(const char *s, const char *opt) {
return (int)v;
}

static int parse_port_arg(const char *s) {
char *end = NULL;
errno = 0;
long v = strtol(s, &end, 10);
if (!s[0] || *end || errno == ERANGE || v < 1 || v > 65535) {
server_log(DS4_LOG_DEFAULT, "ds4-server: --port must be between 1 and 65535: %s", s);
exit(2);
}
return (int)v;
}

static float parse_float_arg(const char *s, const char *opt, float minv, float maxv) {
char *end = NULL;
float v = strtof(s, &end);
Expand Down Expand Up @@ -11439,7 +11450,7 @@ static server_config parse_options(int argc, char **argv) {
} else if (!strcmp(arg, "--host")) {
c.host = need_arg(&i, argc, argv, arg);
} else if (!strcmp(arg, "--port")) {
c.port = parse_int_arg(need_arg(&i, argc, argv, arg), arg);
c.port = parse_port_arg(need_arg(&i, argc, argv, arg));
} else if (!strcmp(arg, "--cors")) {
c.enable_cors = true;
} else if (!strcmp(arg, "--trace")) {
Expand Down