Fix memory leak in YAML I/O.
Stop using BumpPtrAllocator for HNodes because
they have fields (vector, map) which require HNode
destructors to be run.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171896 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/YAMLTraits.cpp b/lib/Support/YAMLTraits.cpp
index ef3948d..9da2aa7 100644
--- a/lib/Support/YAMLTraits.cpp
+++ b/lib/Support/YAMLTraits.cpp
@@ -40,11 +40,17 @@
// Input
//===----------------------------------------------------------------------===//
-Input::Input(StringRef InputContent, void *Ctxt) : IO(Ctxt), CurrentNode(NULL) {
- Strm = new Stream(InputContent, SrcMgr);
+Input::Input(StringRef InputContent, void *Ctxt)
+ : IO(Ctxt),
+ Strm(new Stream(InputContent, SrcMgr)),
+ CurrentNode(NULL) {
DocIterator = Strm->begin();
}
+Input::~Input() {
+
+}
+
error_code Input::error() {
return EC;
}
@@ -65,7 +71,8 @@
++DocIterator;
return setCurrentDocument();
}
- CurrentNode = this->createHNodes(N);
+ TopNode.reset(this->createHNodes(N));
+ CurrentNode = TopNode.get();
return true;
}
return false;
@@ -271,13 +278,13 @@
if (!StringStorage.empty()) {
// Copy string to permanent storage
unsigned Len = StringStorage.size();
- char *Buf = Allocator.Allocate<char>(Len);
+ char *Buf = StringAllocator.Allocate<char>(Len);
memcpy(Buf, &StringStorage[0], Len);
KeyStr = StringRef(Buf, Len);
}
- return new (Allocator) ScalarHNode(N, KeyStr);
+ return new ScalarHNode(N, KeyStr);
} else if (SequenceNode *SQ = dyn_cast<SequenceNode>(N)) {
- SequenceHNode *SQHNode = new (Allocator) SequenceHNode(N);
+ SequenceHNode *SQHNode = new SequenceHNode(N);
for (SequenceNode::iterator i = SQ->begin(), End = SQ->end(); i != End;
++i) {
HNode *Entry = this->createHNodes(i);
@@ -287,7 +294,7 @@
}
return SQHNode;
} else if (MappingNode *Map = dyn_cast<MappingNode>(N)) {
- MapHNode *mapHNode = new (Allocator) MapHNode(N);
+ MapHNode *mapHNode = new MapHNode(N);
for (MappingNode::iterator i = Map->begin(), End = Map->end(); i != End;
++i) {
ScalarNode *KeyScalar = dyn_cast<ScalarNode>(i->getKey());
@@ -296,7 +303,7 @@
if (!StringStorage.empty()) {
// Copy string to permanent storage
unsigned Len = StringStorage.size();
- char *Buf = Allocator.Allocate<char>(Len);
+ char *Buf = StringAllocator.Allocate<char>(Len);
memcpy(Buf, &StringStorage[0], Len);
KeyStr = StringRef(Buf, Len);
}
@@ -307,7 +314,7 @@
}
return mapHNode;
} else if (isa<NullNode>(N)) {
- return new (Allocator) EmptyHNode(N);
+ return new EmptyHNode(N);
} else {
setError(N, "unknown node kind");
return NULL;
@@ -327,6 +334,22 @@
this->setError(CurrentNode, Message);
}
+Input::MapHNode::~MapHNode() {
+ for (MapHNode::NameToNode::iterator i = Mapping.begin(), End = Mapping.end();
+ i != End; ++i) {
+ delete i->second;
+ }
+}
+
+Input::SequenceHNode::~SequenceHNode() {
+ for (std::vector<HNode*>::iterator i = Entries.begin(), End = Entries.end();
+ i != End; ++i) {
+ delete *i;
+ }
+}
+
+
+
//===----------------------------------------------------------------------===//
// Output
//===----------------------------------------------------------------------===//