External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle a key with length over 1024 as a long key. (#916)

Browse Source 
Fixes #501
This commit is contained in:
Chen 2020-07-16 22:51:54 +08:00 committed by GitHub
parent 33315286ab
commit 51ce663085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emitter.cpp
View File

@ -708,7 +708,7 @@ Emitter& Emitter::Write(const std::string& str) {
Utils::ComputeStringFormat(str, m_pState->GetStringFormat(), Utils::ComputeStringFormat(str, m_pState->GetStringFormat(),
m_pState->CurGroupFlowType(), stringEscaping == StringEscaping::NonAscii); m_pState->CurGroupFlowType(), stringEscaping == StringEscaping::NonAscii);
if (strFormat == StringFormat::Literal) if (strFormat == StringFormat::Literal || str.size() > 1024)
m_pState->SetMapKeyFormat(YAML::LongKey, FmtScope::Local); m_pState->SetMapKeyFormat(YAML::LongKey, FmtScope::Local);
PrepareNode(EmitterNodeType::Scalar); PrepareNode(EmitterNodeType::Scalar);

9
test/integration/emitter_test.cpp
View File

@ -266,6 +266,8 @@ TEST_F(EmitterTest, SimpleLongKey) {
} }
TEST_F(EmitterTest, SingleLongKey) { TEST_F(EmitterTest, SingleLongKey) {
const std::string shortKey(1024, 'a');
const std::string longKey(1025, 'a');
out << BeginMap; out << BeginMap;
out << Key << "age"; out << Key << "age";
out << Value << "24"; out << Value << "24";
@ -273,9 +275,14 @@ TEST_F(EmitterTest, SingleLongKey) {
out << Value << "5'9\""; out << Value << "5'9\"";
out << Key << "weight"; out << Key << "weight";
out << Value << 145; out << Value << 145;
out << Key << shortKey;
out << Value << "1";
out << Key << longKey;
out << Value << "1";
out << EndMap; out << EndMap;
ExpectEmit("age: 24\n? height\n: 5'9\"\nweight: 145"); ExpectEmit("age: 24\n? height\n: 5'9\"\nweight: 145\n" + shortKey +
": 1\n? " + longKey + "\n: 1");
} }
TEST_F(EmitterTest, ComplexLongKey) { TEST_F(EmitterTest, ComplexLongKey) {