third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes to MemIo::reserve() for #200 (#213)

Browse Source 
* changes to MemIo::reserve() for #200

* Changes following review by Dan (thanks, Dan).
This commit is contained in:
Robin Mills 2018-01-26 08:19:03 +00:00 committed by D4N
parent b7d76da9d5
commit df4113b765
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/basicio.cpp
View File

@ -1093,11 +1093,16 @@ namespace Exiv2 {
void MemIo::Impl::reserve(long wcount)
{
long need = wcount + idx_;
long blockSize = 32*1024; // 32768 `
long maxBlockSize = 4*1024*1024;
if (!isMalloced_) {
// Minimum size for 1st block is 32kB
long size = EXV_MAX(32768 * (1 + need / 32768), size_);
// Minimum size for 1st block
long size = EXV_MAX(blockSize * (1 + need / blockSize), size_);
byte* data = (byte*)std::malloc(size);
if ( data == NULL ) {
throw Error(60);
}
std::memcpy(data, data_, size_);
data_ = data;
sizeAlloced_ = size;
@ -1106,9 +1111,14 @@ namespace Exiv2 {
if (need > size_) {
if (need > sizeAlloced_) {
// Allocate in blocks of 32kB
long want = 32768 * (1 + need / 32768);
blockSize = 2*sizeAlloced_ ;
if ( blockSize > maxBlockSize ) blockSize = maxBlockSize ;
// Allocate in blocks
long want = blockSize * (1 + need / blockSize );
data_ = (byte*)std::realloc(data_, want);
if ( data_ == NULL ) {
throw Error(60);
}
sizeAlloced_ = want;
isMalloced_ = true;
}

1
src/error.cpp
View File

@ -106,6 +106,7 @@ namespace {
{ 57, N_("invalid memory allocation request") },
{ 58, N_("corrupted image metadata") },
{ 59, N_("Arithmetic operation overflow") },
{ 60, N_("Memory allocation failed") },
};
}