mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9327 from sovrasov:fs_free_on_error_fix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-08-28 20:25:34 +00:00
commit 518c6ae8c6
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/persistence.cpp
View File

@ -4525,6 +4525,7 @@ cvOpenFileStorage( const char* query, CvMemStorage* dststorage, int flags, const
} }
catch (...) catch (...)
{ {
fs->is_opened = true;
cvReleaseFileStorage( &fs ); cvReleaseFileStorage( &fs );
throw; throw;
} }

22
modules/core/test/test_io.cpp
View File

@ -1345,3 +1345,25 @@ TEST(Core_InputOutput, FileStorage_json_bool)
ASSERT_EQ((int)fs["bool_false"], 0); ASSERT_EQ((int)fs["bool_false"], 0);
fs.release(); fs.release();
} }
TEST(Core_InputOutput, FileStorage_free_file_after_exception)
{
const std::string fileName = "test.yml";
const std::string content = "%YAML:1.0\n cameraMatrix;:: !<tag:yaml.org,2002:opencv-matrix>\n";
fstream testFile;
testFile.open(fileName.c_str(), std::fstream::out);
if(!testFile.is_open()) FAIL();
testFile << content;
testFile.close();
try
{
FileStorage fs(fileName, FileStorage::READ + FileStorage::FORMAT_YAML);
FAIL();
}
catch (const std::exception&)
{
}
ASSERT_EQ(std::remove(fileName.c_str()), 0);
}