aboutsummaryrefslogtreecommitdiff
path: root/instrumentation
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-12-20 14:30:06 +0100
committervan Hauser <vh@thc.org>2020-12-20 14:30:06 +0100
commit98ee17bc47b1f1d4664be9955a72727fff8e51fa (patch)
tree5c49dd81c9ab6c47538350b53d8b1fd11abe3f6c /instrumentation
parenta6116ed533e5db74d654bedda9e747f87cbd8494 (diff)
downloadAFLplusplus-98ee17bc47b1f1d4664be9955a72727fff8e51fa.tar.gz
fix endless loop in afl-cc allow/blocklists starting a line with a comment
Diffstat (limited to 'instrumentation')
-rw-r--r--instrumentation/afl-gcc-pass.so.cc6
-rw-r--r--instrumentation/afl-llvm-common.cc6
2 files changed, 8 insertions, 4 deletions
diff --git a/instrumentation/afl-gcc-pass.so.cc b/instrumentation/afl-gcc-pass.so.cc
index c95ead8f..25437609 100644
--- a/instrumentation/afl-gcc-pass.so.cc
+++ b/instrumentation/afl-gcc-pass.so.cc
@@ -622,10 +622,11 @@ struct afl_pass : gimple_opt_pass {
allowListFiles.push_back(line);
else
allowListFunctions.push_back(line);
- getline(fileStream, line);
}
+ getline(fileStream, line);
+
}
if (debug)
@@ -696,10 +697,11 @@ struct afl_pass : gimple_opt_pass {
denyListFiles.push_back(line);
else
denyListFunctions.push_back(line);
- getline(fileStream, line);
}
+ getline(fileStream, line);
+
}
if (debug)
diff --git a/instrumentation/afl-llvm-common.cc b/instrumentation/afl-llvm-common.cc
index 557939fd..a27c4069 100644
--- a/instrumentation/afl-llvm-common.cc
+++ b/instrumentation/afl-llvm-common.cc
@@ -168,10 +168,11 @@ void initInstrumentList() {
allowListFiles.push_back(line);
else
allowListFunctions.push_back(line);
- getline(fileStream, line);
}
+ getline(fileStream, line);
+
}
if (debug)
@@ -242,10 +243,11 @@ void initInstrumentList() {
denyListFiles.push_back(line);
else
denyListFunctions.push_back(line);
- getline(fileStream, line);
}
+ getline(fileStream, line);
+
}
if (debug)