generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed buffer overflow in string handling

Browse Source 
pos should never exceed strlen, else the overflow check 'if (!len)' will wrongfully pass
This commit is contained in:
Philipp Hasper 2015-07-20 09:00:24 +02:00
parent 0726c4d4ea
commit 2b7637df36
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/cvstd.inl.hpp
View File

@ -87,7 +87,7 @@ String::String(const std::string& str, size_t pos, size_t len)
: cstr_(0), len_(0) : cstr_(0), len_(0)
{ {
size_t strlen = str.size(); size_t strlen = str.size();
pos = max(pos, strlen); pos = min(pos, strlen);
len = min(strlen - pos, len); len = min(strlen - pos, len);
if (!len) return; if (!len) return;
memcpy(allocate(len), str.c_str() + pos, len); memcpy(allocate(len), str.c_str() + pos, len);