diff --git a/modules/core/src/persistence_json.cpp b/modules/core/src/persistence_json.cpp index c5326c674a..9d05650814 100644 --- a/modules/core/src/persistence_json.cpp +++ b/modules/core/src/persistence_json.cpp @@ -623,9 +623,7 @@ public: } if( len == 4 && memcmp( beg, "null", 4 ) == 0 ) - { - CV_PARSE_ERROR_CPP( "Value 'null' is not supported by this parser" ); - } + ; else if( (len == 4 && memcmp( beg, "true", 4 ) == 0) || (len == 5 && memcmp( beg, "false", 5 ) == 0) ) { diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp index 6cf4bc8625..67b0ab5803 100644 --- a/modules/core/test/test_io.cpp +++ b/modules/core/test/test_io.cpp @@ -1545,6 +1545,30 @@ TEST(Core_InputOutput, FileStorage_format_yml_gz) EXPECT_EQ(FileStorage::FORMAT_YAML, fs.getFormat()); } +TEST(Core_InputOutput, FileStorage_json_null_object) +{ + std::string test = + "{ " + "\"padding\": null," + "\"truncation\": null," + "\"version\": \"1.0\"" + "}"; + FileStorage fs(test, FileStorage::READ | FileStorage::MEMORY); + + ASSERT_TRUE(fs["padding"].isNone()); + ASSERT_TRUE(fs["truncation"].isNone()); + ASSERT_TRUE(fs["version"].isString()); + + ASSERT_EQ(fs["padding"].name(), "padding"); + ASSERT_EQ(fs["truncation"].name(), "truncation"); + ASSERT_EQ(fs["version"].name(), "version"); + + ASSERT_EQ(fs["padding"].string(), ""); + ASSERT_EQ(fs["truncation"].string(), ""); + ASSERT_EQ(fs["version"].string(), "1.0"); + fs.release(); +} + TEST(Core_InputOutput, FileStorage_json_named_nodes) { std::string test =