<div dir="ltr">Any chance of using unique_ptr here?</div><br><div class="gmail_quote"><div dir="ltr">On Sat, Oct 8, 2016 at 3:06 PM Kostya Serebryany via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kcc<br class="gmail_msg">
Date: Sat Oct 8 16:57:48 2016<br class="gmail_msg">
New Revision: 283675<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=283675&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=283675&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
[libFuzzer] fix use-after-free in libFuzzer found by ... fuzzing.<br class="gmail_msg">
<br class="gmail_msg">
Modified:<br class="gmail_msg">
llvm/trunk/lib/Fuzzer/FuzzerCorpus.h<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/Fuzzer/FuzzerCorpus.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerCorpus.h?rev=283675&r1=283674&r2=283675&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerCorpus.h?rev=283675&r1=283674&r2=283675&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/Fuzzer/FuzzerCorpus.h (original)<br class="gmail_msg">
+++ llvm/trunk/lib/Fuzzer/FuzzerCorpus.h Sat Oct 8 16:57:48 2016<br class="gmail_msg">
@@ -36,25 +36,28 @@ class InputCorpus {<br class="gmail_msg">
public:<br class="gmail_msg">
static const size_t kFeatureSetSize = 1 << 16;<br class="gmail_msg">
InputCorpus() {<br class="gmail_msg">
- Inputs.reserve(1 << 14); // Avoid too many resizes.<br class="gmail_msg">
memset(InputSizesPerFeature, 0, sizeof(InputSizesPerFeature));<br class="gmail_msg">
memset(SmallestElementPerFeature, 0, sizeof(SmallestElementPerFeature));<br class="gmail_msg">
}<br class="gmail_msg">
+ ~InputCorpus() {<br class="gmail_msg">
+ for (auto II : Inputs)<br class="gmail_msg">
+ delete II;<br class="gmail_msg">
+ }<br class="gmail_msg">
size_t size() const { return Inputs.size(); }<br class="gmail_msg">
size_t SizeInBytes() const {<br class="gmail_msg">
size_t Res = 0;<br class="gmail_msg">
- for (auto &II : Inputs)<br class="gmail_msg">
- Res += II.U.size();<br class="gmail_msg">
+ for (auto II : Inputs)<br class="gmail_msg">
+ Res += II->U.size();<br class="gmail_msg">
return Res;<br class="gmail_msg">
}<br class="gmail_msg">
size_t NumActiveUnits() const {<br class="gmail_msg">
size_t Res = 0;<br class="gmail_msg">
- for (auto &II : Inputs)<br class="gmail_msg">
- Res += !II.U.empty();<br class="gmail_msg">
+ for (auto II : Inputs)<br class="gmail_msg">
+ Res += !II->U.empty();<br class="gmail_msg">
return Res;<br class="gmail_msg">
}<br class="gmail_msg">
bool empty() const { return Inputs.empty(); }<br class="gmail_msg">
- const Unit &operator[] (size_t Idx) const { return Inputs[Idx].U; }<br class="gmail_msg">
+ const Unit &operator[] (size_t Idx) const { return Inputs[Idx]->U; }<br class="gmail_msg">
void AddToCorpus(const Unit &U, size_t NumFeatures) {<br class="gmail_msg">
assert(!U.empty());<br class="gmail_msg">
uint8_t Hash[kSHA1NumBytes];<br class="gmail_msg">
@@ -62,8 +65,8 @@ class InputCorpus {<br class="gmail_msg">
Printf("ADD_TO_CORPUS %zd NF %zd\n", Inputs.size(), NumFeatures);<br class="gmail_msg">
ComputeSHA1(U.data(), U.size(), Hash);<br class="gmail_msg">
Hashes.insert(Sha1ToString(Hash));<br class="gmail_msg">
- Inputs.push_back(InputInfo());<br class="gmail_msg">
- InputInfo &II = Inputs.back();<br class="gmail_msg">
+ Inputs.push_back(new InputInfo());<br class="gmail_msg">
+ InputInfo &II = *Inputs.back();<br class="gmail_msg">
II.U = U;<br class="gmail_msg">
II.NumFeatures = NumFeatures;<br class="gmail_msg">
memcpy(II.Sha1, Hash, kSHA1NumBytes);<br class="gmail_msg">
@@ -71,14 +74,10 @@ class InputCorpus {<br class="gmail_msg">
ValidateFeatureSet();<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
- typedef const std::vector<InputInfo>::const_iterator ConstIter;<br class="gmail_msg">
- ConstIter begin() const { return Inputs.begin(); }<br class="gmail_msg">
- ConstIter end() const { return Inputs.end(); }<br class="gmail_msg">
-<br class="gmail_msg">
bool HasUnit(const Unit &U) { return Hashes.count(Hash(U)); }<br class="gmail_msg">
bool HasUnit(const std::string &H) { return Hashes.count(H); }<br class="gmail_msg">
InputInfo &ChooseUnitToMutate(Random &Rand) {<br class="gmail_msg">
- InputInfo &II = Inputs[ChooseUnitIdxToMutate(Rand)];<br class="gmail_msg">
+ InputInfo &II = *Inputs[ChooseUnitIdxToMutate(Rand)];<br class="gmail_msg">
assert(!II.U.empty());<br class="gmail_msg">
return II;<br class="gmail_msg">
};<br class="gmail_msg">
@@ -94,7 +93,7 @@ class InputCorpus {<br class="gmail_msg">
<br class="gmail_msg">
void PrintStats() {<br class="gmail_msg">
for (size_t i = 0; i < Inputs.size(); i++) {<br class="gmail_msg">
- const auto &II = Inputs[i];<br class="gmail_msg">
+ const auto &II = *Inputs[i];<br class="gmail_msg">
Printf(" [%zd %s]\tsz: %zd\truns: %zd\tsucc: %zd\n", i,<br class="gmail_msg">
Sha1ToString(II.Sha1).c_str(), II.U.size(),<br class="gmail_msg">
II.NumExecutedMutations, II.NumSuccessfullMutations);<br class="gmail_msg">
@@ -108,7 +107,7 @@ class InputCorpus {<br class="gmail_msg">
}<br class="gmail_msg">
Printf("\n\t");<br class="gmail_msg">
for (size_t i = 0; i < Inputs.size(); i++)<br class="gmail_msg">
- if (size_t N = Inputs[i].NumFeatures)<br class="gmail_msg">
+ if (size_t N = Inputs[i]->NumFeatures)<br class="gmail_msg">
Printf(" %zd=>%zd ", i, N);<br class="gmail_msg">
Printf("\n");<br class="gmail_msg">
}<br class="gmail_msg">
@@ -119,7 +118,7 @@ class InputCorpus {<br class="gmail_msg">
uint32_t OldSize = GetFeature(Idx);<br class="gmail_msg">
if (OldSize == 0 || (Shrink && OldSize > NewSize)) {<br class="gmail_msg">
if (OldSize > 0) {<br class="gmail_msg">
- InputInfo &II = Inputs[SmallestElementPerFeature[Idx]];<br class="gmail_msg">
+ InputInfo &II = *Inputs[SmallestElementPerFeature[Idx]];<br class="gmail_msg">
assert(II.NumFeatures > 0);<br class="gmail_msg">
II.NumFeatures--;<br class="gmail_msg">
if (II.NumFeatures == 0) {<br class="gmail_msg">
@@ -157,12 +156,12 @@ private:<br class="gmail_msg">
PrintFeatureSet();<br class="gmail_msg">
for (size_t Idx = 0; Idx < kFeatureSetSize; Idx++)<br class="gmail_msg">
if (GetFeature(Idx))<br class="gmail_msg">
- Inputs[SmallestElementPerFeature[Idx]].Tmp++;<br class="gmail_msg">
- for (auto &II: Inputs) {<br class="gmail_msg">
- if (II.Tmp != II.NumFeatures)<br class="gmail_msg">
- Printf("ZZZ %zd %zd\n", II.Tmp, II.NumFeatures);<br class="gmail_msg">
- assert(II.Tmp == II.NumFeatures);<br class="gmail_msg">
- II.Tmp = 0;<br class="gmail_msg">
+ Inputs[SmallestElementPerFeature[Idx]]->Tmp++;<br class="gmail_msg">
+ for (auto II: Inputs) {<br class="gmail_msg">
+ if (II->Tmp != II->NumFeatures)<br class="gmail_msg">
+ Printf("ZZZ %zd %zd\n", II->Tmp, II->NumFeatures);<br class="gmail_msg">
+ assert(II->Tmp == II->NumFeatures);<br class="gmail_msg">
+ II->Tmp = 0;<br class="gmail_msg">
}<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
@@ -175,7 +174,7 @@ private:<br class="gmail_msg">
std::iota(Intervals.begin(), Intervals.end(), 0);<br class="gmail_msg">
if (CountingFeatures)<br class="gmail_msg">
for (size_t i = 0; i < N; i++)<br class="gmail_msg">
- Weights[i] = Inputs[i].NumFeatures * (i + 1);<br class="gmail_msg">
+ Weights[i] = Inputs[i]->NumFeatures * (i + 1);<br class="gmail_msg">
else<br class="gmail_msg">
std::iota(Weights.begin(), Weights.end(), 1);<br class="gmail_msg">
CorpusDistribution = std::piecewise_constant_distribution<double>(<br class="gmail_msg">
@@ -187,7 +186,7 @@ private:<br class="gmail_msg">
std::vector<double> Weights;<br class="gmail_msg">
<br class="gmail_msg">
std::unordered_set<std::string> Hashes;<br class="gmail_msg">
- std::vector<InputInfo> Inputs;<br class="gmail_msg">
+ std::vector<InputInfo*> Inputs;<br class="gmail_msg">
<br class="gmail_msg">
bool CountingFeatures = false;<br class="gmail_msg">
uint32_t InputSizesPerFeature[kFeatureSetSize];<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
llvm-commits mailing list<br class="gmail_msg">
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
</blockquote></div>