maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[yaml2obj] - Don't crash on one more invalid document. 

This fixes one more crash I faced.
Testcase contains minimal reduced case.

Differential revision: https://reviews.llvm.org/D38082

llvm-svn: 313868
This commit is contained in:
George Rimar 2017-09-21 08:25:59 +00:00
parent 5536a01ad2
commit 3674fb6f2c
2 changed files with 13 additions and 5 deletions
llvm
lib/Support
YAMLTraits.cpp
test/Object
yaml2obj-invalid.yaml

14
llvm/lib/Support/YAMLTraits.cpp
View File

@ -374,18 +374,22 @@ std::unique_ptr<Input::HNode> Input::createHNodes(Node *N) {
auto mapHNode = llvm::make_unique<MapHNode>(N);
for (KeyValueNode &KVN : *Map) {
Node *KeyNode = KVN.getKey();
ScalarNode *KeyScalar = dyn_cast<ScalarNode>(KeyNode);
if (!KeyScalar) {
setError(KeyNode, "Map key must be a scalar");
ScalarNode *Key = dyn_cast<ScalarNode>(KeyNode);
Node *Value = KVN.getValue();
if (!Key || !Value) {
if (!Key)
setError(KeyNode, "Map key must be a scalar");
if (!Value)
setError(KeyNode, "Map value must not be empty");
break;
}
StringStorage.clear();
StringRef KeyStr = KeyScalar->getValue(StringStorage);
StringRef KeyStr = Key->getValue(StringStorage);
if (!StringStorage.empty()) {
// Copy string to permanent storage
KeyStr = StringStorage.str().copy(StringAllocator);
}
auto ValueHNode = this->createHNodes(KVN.getValue());
auto ValueHNode = this->createHNodes(Value);
if (EC)
break;
mapHNode->Mapping[KeyStr] = std::move(ValueHNode);

4
llvm/test/Object/yaml2obj-invalid.yaml Normal file
View File

@ -0,0 +1,4 @@
AAA: | BBB
# RUN: not yaml2obj %s 2>&1 | FileCheck %s
# CHECK: Map value must not be empty