diff options
author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:12:41 +0200 |
---|---|---|
committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:12:41 +0200 |
commit | 1d62bf1c37b9a1803745abb41ed41057959a45d2 (patch) | |
tree | 3e33e4d0535291ca5a6968c3ed5bb18f72acd20e /src/afl-analyze.c | |
parent | 982d46e7cb2c7cabcd8969e6303c3cb8f3d8e56a (diff) | |
parent | 1374e65401c9d40b449c78459a2d0241c779b989 (diff) | |
download | afl++-1d62bf1c37b9a1803745abb41ed41057959a45d2.tar.gz |
solve conflicts
Diffstat (limited to 'src/afl-analyze.c')
-rw-r--r-- | src/afl-analyze.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/afl-analyze.c b/src/afl-analyze.c index 510ec94a..952786b0 100644 --- a/src/afl-analyze.c +++ b/src/afl-analyze.c @@ -902,6 +902,8 @@ int main(int argc, char **argv, char **envp) { if (mem_limit_given) FATAL("Multiple -m options not supported"); mem_limit_given = 1; + if (!optarg) { FATAL("Bad syntax used for -m"); } + if (!strcmp(optarg, "none")) { mem_limit = 0; @@ -938,6 +940,8 @@ int main(int argc, char **argv, char **envp) { if (timeout_given) FATAL("Multiple -t options not supported"); timeout_given = 1; + if (!optarg) FATAL("Wrong usage of -t"); + exec_tmout = atoi(optarg); if (exec_tmout < 10 || optarg[0] == '-') |