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

Use DataBuf, rather than new[], for automatic delete when an exception is throw.

Browse Source
This commit is contained in:
Kevin Backhouse 2021-07-31 14:39:11 +01:00
parent 38a7733b0b
commit b8ed3867c0
No known key found for this signature in database
GPG Key ID: 9DD01852EE40366E
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pngimage.cpp
View File

@ -317,28 +317,29 @@ namespace Exiv2 {
if( bDump ) {
DataBuf dataBuf;
auto data = new byte[dataOffset + 1];
data[dataOffset] = 0;
bufRead = io_->read(data,dataOffset);
enforce(static_cast<uint64_t>(dataOffset) < static_cast<unsigned long>(std::numeric_limits<long>::max()), kerFailedToReadImageData);
DataBuf data(static_cast<long>(dataOffset) + 1);
data.pData_[dataOffset] = 0;
bufRead = io_->read(data.pData_, static_cast<long>(dataOffset));
enforce(bufRead == static_cast<long>(dataOffset), kerFailedToReadImageData);
io_->seek(restore, BasicIo::beg);
uint32_t name_l = static_cast<uint32_t>(std::strlen(reinterpret_cast<const char*>(data))) +
1; // leading string length
enforce(name_l <= dataOffset, kerCorruptedMetadata);
size_t name_l = std::strlen(reinterpret_cast<const char*>(data.pData_)) +
1; // leading string length
enforce(name_l < dataOffset, kerCorruptedMetadata);
uint32_t start = name_l;
uint32_t start = static_cast<uint32_t>(name_l);
bool bLF = false;
// decode the chunk
bool bGood = false;
if ( tEXt ) {
bGood = tEXtToDataBuf(data+name_l,dataOffset-name_l,dataBuf);
bGood = tEXtToDataBuf(data.pData_ + name_l, dataOffset-name_l, dataBuf);
}
if ( zTXt || iCCP ) {
bGood = zlibToDataBuf(data+name_l+1,dataOffset-name_l-1,dataBuf); // +1 = 'compressed' flag
bGood = zlibToDataBuf(data.pData_ + name_l + 1, dataOffset - name_l - 1, dataBuf); // +1 = 'compressed' flag
}
if ( iTXt ) {
bGood = (start+3) < dataOffset ; // good if not a nul chunk
bGood = (3 <= dataOffset) && (start < dataOffset-3); // good if not a nul chunk
}
if ( eXIf ) {
bGood = true ;// eXIf requires no pre-processing)
@ -347,8 +348,8 @@ namespace Exiv2 {
// format is content dependent
if ( bGood ) {
if ( bXMP ) {
while (start < dataOffset && !data[start]) start++; // skip leading nul bytes
out << data+start; // output the xmp
while (start < dataOffset && !data.pData_[start]) start++; // skip leading nul bytes
out << data.pData_ + start; // output the xmp
}
if ( bExif || bIptc ) {
@ -389,13 +390,12 @@ namespace Exiv2 {
}
if ( eXIf && option == kpsRecursive ) {
// create memio object with the data, then print the structure
BasicIo::UniquePtr p = BasicIo::UniquePtr(new MemIo(data,dataOffset));
BasicIo::UniquePtr p = BasicIo::UniquePtr(new MemIo(data.pData_, dataOffset));
printTiffStructure(*p,out,option,depth);
}
if ( bLF ) out << std::endl;
}
delete[] data;
}
io_->seek(dataOffset+4, BasicIo::cur);// jump past checksum
if (io_->error()) throw Error(kerFailedToReadImageData);