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

[George Rimar via llvm-commits]

Author: grimar
Date: Thu Sep 21 01:25:59 2017
New Revision: 313868

URL: http://llvm.org/viewvc/llvm-project?rev=313868&view=rev
Log:
[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

Added:
    llvm/trunk/test/Object/yaml2obj-invalid.yaml
Modified:
    llvm/trunk/lib/Support/YAMLTraits.cpp

Modified: llvm/trunk/lib/Support/YAMLTraits.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLTraits.cpp?rev=313868&r1=313867&r2=313868&view=diff
==============================================================================
--- llvm/trunk/lib/Support/YAMLTraits.cpp (original)
+++ llvm/trunk/lib/Support/YAMLTraits.cpp Thu Sep 21 01:25:59 2017
@@ -374,18 +374,22 @@ std::unique_ptr<Input::HNode> Input::cre
     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);

Added: llvm/trunk/test/Object/yaml2obj-invalid.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/yaml2obj-invalid.yaml?rev=313868&view=auto
==============================================================================
--- llvm/trunk/test/Object/yaml2obj-invalid.yaml (added)
+++ llvm/trunk/test/Object/yaml2obj-invalid.yaml Thu Sep 21 01:25:59 2017
@@ -0,0 +1,4 @@
+AAA: | BBB
+
+# RUN: not yaml2obj %s 2>&1 | FileCheck %s
+# CHECK: Map value must not be empty