From 5e68b28ad320c6f65b38b811652178f7f3c49bb4 Mon Sep 17 00:00:00 2001
From: Vladislav Sovrasov <sovrasov.vlad@gmail.com>
Date: Mon, 7 Aug 2017 16:20:38 +0300
Subject: [PATCH] core: fix file not closed when exception in FS

---
 modules/core/src/persistence.cpp | 1 +
 modules/core/test/test_io.cpp    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp
index 3f12fc42e7..e2d223d4b0 100644
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -4525,6 +4525,7 @@ cvOpenFileStorage( const char* query, CvMemStorage* dststorage, int flags, const
         }
         catch (...)
         {
+            fs->is_opened = true;
             cvReleaseFileStorage( &fs );
             throw;
         }
diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp
index b725dbcf23..a70b2aac98 100644
--- a/modules/core/test/test_io.cpp
+++ b/modules/core/test/test_io.cpp
@@ -1352,7 +1352,7 @@ TEST(Core_InputOutput, FileStorage_free_file_after_exception)
     const std::string content = "%YAML:1.0\n cameraMatrix;:: !<tag:yaml.org,2002:opencv-matrix>\n";
 
     fstream testFile;
-    testFile.open(fileName, std::fstream::out);
+    testFile.open(fileName.c_str(), std::fstream::out);
     if(!testFile.is_open()) FAIL();
     testFile << content;
     testFile.close();
@@ -1360,9 +1360,10 @@ TEST(Core_InputOutput, FileStorage_free_file_after_exception)
     try
     {
         FileStorage fs(fileName, FileStorage::READ + FileStorage::FORMAT_YAML);
+        FAIL();
     }
     catch (const std::exception&)
     {
-        ASSERT_EQ(std::remove(fileName.c_str()), 0);
     }
+    ASSERT_EQ(std::remove(fileName.c_str()), 0);
 }