mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

address security concerns in persistence

Browse Source
This commit is contained in:
rogday 2022-04-13 22:45:43 +03:00 committed by Smirnov Egor
parent 03c9648f2e
commit 7daf84fb44
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -817,7 +817,7 @@ char *FileStorage::Impl::gets(size_t maxCount) {
int delta = (int) strlen(ptr); int delta = (int) strlen(ptr);
ofs += delta; ofs += delta;
maxCount -= delta; maxCount -= delta;
if (ptr[delta - 1] == '\n' || maxCount == 0) if (delta == 0 || ptr[delta - 1] == '\n' || maxCount == 0)
break; break;
if (delta == count) if (delta == count)
buffer.resize((size_t) (buffer.size() * 1.5)); buffer.resize((size_t) (buffer.size() * 1.5));

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

@ -3,6 +3,8 @@
// of this distribution and at http://opencv.org/license.html. // of this distribution and at http://opencv.org/license.html.
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include <fstream>
namespace opencv_test { namespace { namespace opencv_test { namespace {
static SparseMat cvTsGetRandomSparseMat(int dims, const int* sz, int type, static SparseMat cvTsGetRandomSparseMat(int dims, const int* sz, int type,
@ -799,6 +801,25 @@ TEST(Core_InputOutput, filestorage_base64_basic_memory_JSON)
test_filestorage_basic(cv::FileStorage::WRITE_BASE64, ".json", true, true); test_filestorage_basic(cv::FileStorage::WRITE_BASE64, ".json", true, true);
} }
// issue #21851
TEST(Core_InputOutput, filestorage_heap_overflow)
{
const ::testing::TestInfo* const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
CV_Assert(test_info);
std::string name = std::string(test_info->test_case_name()) + "--" + test_info->name();
const char data[] = {0x00, 0x2f, 0x4a, 0x4a, 0x50, 0x4a, 0x4a };
std::ofstream file;
file.open(name, std::ios_base::binary);
assert(file.is_open());
file.write(data, sizeof(data));
file.close();
// This just shouldn't segfault, otherwise it's fine
EXPECT_ANY_THROW(FileStorage(name, FileStorage::READ));
}
TEST(Core_InputOutput, filestorage_base64_valid_call) TEST(Core_InputOutput, filestorage_base64_valid_call)
{ {