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

Fixed test whether data area is outside of the data buffer (partially tested).

Browse Source
This commit is contained in:
Andreas Huggel 2008-10-19 15:05:53 +00:00
parent ec451c36ea
commit fcd7b2ca45
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/actions.cpp
View File

@ -561,8 +561,13 @@ namespace Action {
}
else {
Exiv2::DataBuf buf = exifThumb.copy();
std::cout << exifThumb.mimeType() << ", "
<< buf.size_ << " " << _("Bytes");
if (buf.size_ == 0) {
std::cout << _("None");
}
else {
std::cout << exifThumb.mimeType() << ", "
<< buf.size_ << " " << _("Bytes");
}
}
std::cout << std::endl;
@ -1084,9 +1089,11 @@ namespace Action {
if (dontOverwrite(thumbPath)) return 0;
if (Params::instance().verbose_) {
Exiv2::DataBuf buf = exifThumb.copy();
std::cout << _("Writing thumbnail") << " (" << exifThumb.mimeType() << ", "
<< buf.size_ << " " << _("Bytes") << ") " << _("to file") << " "
<< thumbPath << std::endl;
if (buf.size_ != 0) {
std::cout << _("Writing thumbnail") << " (" << exifThumb.mimeType() << ", "
<< buf.size_ << " " << _("Bytes") << ") " << _("to file") << " "
<< thumbPath << std::endl;
}
}
rc = exifThumb.writeFile(thumb);
if (rc == 0) {

1
src/exif.cpp
View File

@ -282,6 +282,7 @@ namespace Exiv2 {
if (thumbnail.get() == 0) return 0;
std::string name = path + thumbnail->extension();
DataBuf buf(thumbnail->copy(exifData_));
if (buf.size_ == 0) return 0;
return Exiv2::writeFile(buf, name);
}

40
src/tiffcomposite.cpp
View File

@ -285,32 +285,34 @@ namespace Exiv2 {
#endif
return;
}
long size = 0;
for (long i = 0; i < pSize->count(); ++i) {
size += pSize->toLong(i);
uint32_t size = 0;
for (int i = 0; i < pSize->count(); ++i) {
size += static_cast<uint32_t>(pSize->toLong(i));
}
long offset = pValue()->toLong(0);
uint32_t offset = static_cast<uint32_t>(pValue()->toLong(0));
// Todo: Remove limitation of JPEG writer: strips must be contiguous
// Until then we check: last offset + last size - first offset == size?
if ( pValue()->toLong(pValue()->count()-1)
+ pSize->toLong(pSize->count()-1)
if ( static_cast<uint32_t>(pValue()->toLong(pValue()->count()-1))
+ static_cast<uint32_t>(pSize->toLong(pSize->count()-1))
- offset != size) {
#ifndef SUPPRESS_WARNINGS
std::cerr << "Warning: "
<< "Directory " << tiffGroupName(group())
<< ", entry 0x" << std::setw(4)
<< std::setfill('0') << std::hex << tag()
<< " Data area is not contiguous, ignoring it.\n";
<< ": Data area is not contiguous, ignoring it.\n";
#endif
return;
}
if (baseOffset + offset + size > sizeData) {
if ( offset > sizeData
|| size > sizeData
|| baseOffset + offset > sizeData - size) {
#ifndef SUPPRESS_WARNINGS
std::cerr << "Warning: "
<< "Directory " << tiffGroupName(group())
<< ", entry 0x" << std::setw(4)
<< std::setfill('0') << std::hex << tag()
<< " Data area exceeds data buffer, ignoring it.\n";
<< ": Data area exceeds data buffer, ignoring it.\n";
#endif
return;
}
@ -339,23 +341,25 @@ namespace Exiv2 {
return;
}
for (int i = 0; i < pValue()->count(); ++i) {
const byte* pStrip = pData + baseOffset + pValue()->toLong(i);
const uint32_t stripSize = static_cast<uint32_t>(pSize->toLong(i));
if ( stripSize > 0
&& pData + sizeData > pStrip
&& static_cast<uint32_t>(pData + sizeData - pStrip) >= stripSize) {
strips_.push_back(std::make_pair(pStrip, stripSize));
}
const uint32_t offset = static_cast<uint32_t>(pValue()->toLong(i));
const byte* pStrip = pData + baseOffset + offset;
const uint32_t size = static_cast<uint32_t>(pSize->toLong(i));
if ( offset > sizeData
|| size > sizeData
|| baseOffset + offset > sizeData - size) {
#ifndef SUPPRESS_WARNINGS
else {
std::cerr << "Warning: "
<< "Directory " << tiffGroupName(group())
<< ", entry 0x" << std::setw(4)
<< std::setfill('0') << std::hex << tag()
<< ": Strip " << std::dec << i
<< " is outside of the data area; ignored.\n";
}
#endif
}
else if (size != 0) {
strips_.push_back(std::make_pair(pStrip, size));
}
}
} // TiffImageEntry::setStrips