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

Fix another case revealed by tests

Browse Source
This commit is contained in:
Luis Díaz Más 2022-02-23 22:25:52 +01:00
parent 6e50714726
commit 615ccff5ab
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/metacopy.cpp
View File

@ -59,7 +59,9 @@ try {
Exiv2::Image::UniquePtr writeImg = Exiv2::ImageFactory::open(params.write_);
assert(writeImg.get() != 0);
if (params.preserve_) writeImg->readMetadata();
if (params.preserve_) {
writeImg->readMetadata();
}
if (params.iptc_) {
writeImg->setIptcData(readImg->iptcData());
}

1
src/iptc.cpp
View File

@ -505,6 +505,7 @@ namespace Exiv2 {
DataBuf IptcParser::encode(const IptcData& iptcData)
{
/// \todo if iptcData.size() == 0 return early
DataBuf buf(iptcData.size());
byte *pWrite = buf.data();

5
src/jpgimage.cpp
View File

@ -1013,6 +1013,7 @@ namespace Exiv2 {
// potential to change segment ordering (which is allowed).
// Segments are erased if there is no assigned metadata.
while (marker != sos_ && search > 0) {
/// \todo same block than above ... reuse!!!
// 2-byte buffer for reading the size.
byte sizebuf[2];
uint16_t size = 0;
@ -1147,10 +1148,10 @@ namespace Exiv2 {
static_cast<long>(psBlob.size()), iptcData_);
const long maxChunkSize = 0xffff - 16;
const byte* chunkStart = newPsData.c_data();
const byte* chunkEnd = newPsData.c_data(newPsData.size()-1);
const byte* chunkEnd = newPsData.size() == 0 ? nullptr : newPsData.c_data(newPsData.size()-1);
while (chunkStart < chunkEnd) {
// Determine size of next chunk
long chunkSize = static_cast<long>(chunkEnd - chunkStart);
long chunkSize = static_cast<long>(chunkEnd + 1 - chunkStart);
if (chunkSize > maxChunkSize) {
chunkSize = maxChunkSize;
// Don't break at a valid IRB boundary