Merge pull request #4202 from PhilLab:patch-5

This commit is contained in:
Alexander Alekhin 2015-07-20 15:13:43 +00:00
commit dac071ed78

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);