From a165f5557974c7ba32e5d6c966ec053d2bf932cc Mon Sep 17 00:00:00 2001
From: TH3CHARLie <th3charlie@gmail.com>
Date: Mon, 4 Nov 2019 21:27:48 +0800
Subject: [PATCH] Merge pull request #15842 from TH3CHARLie:yaml-fix

* fix yaml parse

* add test for YAML parse multiple documents

* remove trailing whitespace in test
---
 modules/core/src/persistence_yml.cpp |  3 +--
 modules/core/test/test_io.cpp        | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/persistence_yml.cpp b/modules/core/src/persistence_yml.cpp
index 7742e82770..49f4d01841 100644
--- a/modules/core/src/persistence_yml.cpp
+++ b/modules/core/src/persistence_yml.cpp
@@ -770,7 +770,7 @@ public:
         bool first = true;
         bool ok = true;
         FileNode root_collection(fs->getFS(), 0, 0);
-
+        FileNode root_node = fs->addNode(root_collection, std::string(), FileNode::NONE);
         for(;;)
         {
             // 0. skip leading comments and directives  and ...
@@ -821,7 +821,6 @@ public:
             if( memcmp( ptr, "...", 3 ) != 0 )
             {
                 // 2. parse the collection
-                FileNode root_node = fs->addNode(root_collection, std::string(), FileNode::NONE);
 
                 ptr = parseValue( ptr, root_node, 0, false );
                 if( !root_node.isMap() && !root_node.isSeq() )
diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp
index 1e1496bfc7..0f9b0218b8 100644
--- a/modules/core/test/test_io.cpp
+++ b/modules/core/test/test_io.cpp
@@ -1640,4 +1640,23 @@ TEST(Core_InputOutput, FileStorage_free_file_after_exception)
     ASSERT_EQ(0, std::remove(fileName.c_str()));
 }
 
+TEST(Core_InputOutput, FileStorage_YAML_parse_multiple_documents)
+{
+    const std::string filename = "FileStorage_YAML_parse_multiple_documents.yml";
+    FileStorage fs;
+
+    fs.open(filename, FileStorage::WRITE);
+    fs << "a" << 42;
+    fs.release();
+
+    fs.open(filename, FileStorage::APPEND);
+    fs << "b" << 1988;
+    fs.release();
+
+    fs.open(filename, FileStorage::READ);
+    ASSERT_EQ(42, (int)fs["a"]);
+    ASSERT_EQ(1988, (int)fs["b"]);
+    fs.release();
+}
+
 }} // namespace