about summary refs log tree commit diff
diff options
context:
space:
mode:
authorhexcoder- <heiko@hexco.de>2020-02-03 22:32:01 +0100
committerhexcoder- <heiko@hexco.de>2020-02-03 22:32:01 +0100
commitb66543bb29d417d12ec39ed0692c71d2a4beeb40 (patch)
tree32a983a5ad8529ada7e97af8326d641a05b96b1b
parent0f25a2b4342b75e071c215303dc706b2cf204954 (diff)
parent026b68c47b3a6196eb8c2fd55b4b37cea4076cce (diff)
downloadafl++-b66543bb29d417d12ec39ed0692c71d2a4beeb40.tar.gz
Merge branch 'master' of https://github.com/vanhauser-thc/AFLplusplus
-rw-r--r--src/afl-showmap.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/afl-showmap.c b/src/afl-showmap.c
index 06dbbf8e..ddf5c4ce 100644
--- a/src/afl-showmap.c
+++ b/src/afl-showmap.c
@@ -894,7 +894,12 @@ int main(int argc, char** argv) {
 
   }
 
-  if (in_dir) at_file = "@@";
+  if (in_dir)  {
+  
+    if (at_file) PFATAL("Options -A and -i are mutually exclusive");
+    at_file = "@@";
+  
+  }
 
   detect_file_args(argv + optind, at_file);