[PATCH] D140474: [YAML IO] Check that mapping doesn't contain duplicating keys
Anton Sidorenko via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Jan 16 07:05:26 PST 2023
asi-sc updated this revision to Diff 489549.
asi-sc added a comment.
Remove tests in yaml2obj, add unittest for YAMLIO
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140474/new/
https://reviews.llvm.org/D140474
Files:
llvm/lib/Support/YAMLTraits.cpp
llvm/unittests/Support/YAMLIOTest.cpp
Index: llvm/unittests/Support/YAMLIOTest.cpp
===================================================================
--- llvm/unittests/Support/YAMLIOTest.cpp
+++ llvm/unittests/Support/YAMLIOTest.cpp
@@ -105,6 +105,18 @@
EXPECT_TRUE(!!yin.error());
}
+//
+// Test the reading of a map containing duplicated keys
+//
+TEST(YAMLIO, TestMapDuplicatedKeysRead) {
+ FooBar doc;
+ // YAML spec: "The content of a mapping node is an unordered set of key/value
+ // node pairs, with the restriction that each of the keys is unique."
+ Input yin("{foo: 3\n bar: 5\nfoo: 3}", nullptr, suppressErrorMessages);
+ yin >> doc;
+ EXPECT_TRUE(!!yin.error());
+}
+
//
// Test the reading of a yaml sequence of mappings
//
Index: llvm/lib/Support/YAMLTraits.cpp
===================================================================
--- llvm/lib/Support/YAMLTraits.cpp
+++ llvm/lib/Support/YAMLTraits.cpp
@@ -435,6 +435,11 @@
// Copy string to permanent storage
KeyStr = StringStorage.str().copy(StringAllocator);
}
+ if (mapHNode->Mapping.count(KeyStr))
+ // From YAML spec: "The content of a mapping node is an unordered set of
+ // key/value node pairs, with the restriction that each of the keys is
+ // unique."
+ setError(KeyNode, Twine("duplicated mapping key '") + KeyStr);
auto ValueHNode = createHNodes(Value);
if (EC)
break;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D140474.489549.patch
Type: text/x-patch
Size: 1408 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230116/deacaa39/attachment.bin>
More information about the llvm-commits
mailing list