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

Prevent passing of null-pointers to libc functions

Browse Source
This commit is contained in:
Dan Čermák 2018-04-25 00:02:08 +02:00
parent 2bf89f4854
commit fc60d97a29
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/basicio.cpp
View File

@ -1091,9 +1091,9 @@ namespace Exiv2 {
void MemIo::Impl::reserve(long wcount)
{
long need = wcount + idx_;
const long need = wcount + idx_;
long blockSize = 32*1024; // 32768 `
long maxBlockSize = 4*1024*1024;
const long maxBlockSize = 4*1024*1024;
if (!isMalloced_) {
// Minimum size for 1st block
@ -1102,7 +1102,9 @@ namespace Exiv2 {
if ( data == NULL ) {
throw Error(kerMallocFailed);
}
std::memcpy(data, data_, size_);
if (data_ != NULL) {
std::memcpy(data, data_, size_);
}
data_ = data;
sizeAlloced_ = size;
isMalloced_ = true;
@ -1146,7 +1148,9 @@ namespace Exiv2 {
{
p_->reserve(wcount);
assert(p_->isMalloced_);
std::memcpy(&p_->data_[p_->idx_], data, wcount);
if (data != NULL) {
std::memcpy(&p_->data_[p_->idx_], data, wcount);
}
p_->idx_ += wcount;
return wcount;
}

4
src/tiffcomposite_int.cpp
View File

@ -380,7 +380,9 @@ namespace Exiv2 {
if (newSize > size_) {
setData(DataBuf(newSize));
}
memset(pData_, 0x0, size_);
if (pData_ != NULL) {
memset(pData_, 0x0, size_);
}
size_ = value->copy(pData_, byteOrder);
assert(size_ == newSize);
setValue(value);