packages/exempi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!16 [sync] PR-12: CVE补丁

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2024-05-30 09:30:54 +00:00 committed by Gitee
commit e1d6745139
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 1643 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

942
202107.patch Normal file
View File

@ -0,0 +1,942 @@
Backport of:
From 9c78968498f3321bd50c817bae585bb0936e5e08 Mon Sep 17 00:00:00 2001
From: arpitapanda05 <79362772+arpitapanda05@users.noreply.github.com>
Date: Thu, 15 Jul 2021 22:39:17 +0530
Subject: Security Fixes and Exif Time Zone Metadata Support
Co-authored-by: prigupta <prigupta@adobe.com>
---
XMPCore/source/XMPUtils-FileInfo.cpp | 9 +-
XMPFiles/source/FileHandlers/FLV_Handler.cpp | 2 +
XMPFiles/source/FileHandlers/P2_Handler.cpp | 38 ++++---
XMPFiles/source/FileHandlers/PSD_Handler.cpp | 14 ++-
XMPFiles/source/FileHandlers/SWF_Handler.cpp | 10 ++
XMPFiles/source/FileHandlers/TIFF_Handler.cpp | 2 +-
XMPFiles/source/FileHandlers/UCF_Handler.cpp | 7 +-
XMPFiles/source/FileHandlers/UCF_Handler.hpp | 1 +
XMPFiles/source/FormatSupport/ASF_Support.cpp | 11 +-
XMPFiles/source/FormatSupport/ID3_Support.cpp | 2 +-
XMPFiles/source/FormatSupport/P2_Support.cpp | 9 +-
XMPFiles/source/FormatSupport/PNG_Support.cpp | 2 +-
.../source/FormatSupport/PostScript_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/RIFF.cpp | 4 +
XMPFiles/source/FormatSupport/ReconcileLegacy.hpp | 24 ++--
XMPFiles/source/FormatSupport/ReconcileTIFF.cpp | 121 +++++++++++++++++----
XMPFiles/source/FormatSupport/SVG_Adapter.cpp | 8 +-
XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp | 36 +++---
.../source/FormatSupport/TIFF_MemoryReader.cpp | 8 +-
XMPFiles/source/FormatSupport/TIFF_Support.hpp | 30 ++++-
.../source/PluginHandler/FileHandlerInstance.cpp | 5 +-
XMPFiles/source/WXMPFiles.cpp | 13 ++-
XMPFiles/source/XMPFiles.cpp | 6 +-
public/include/TXMPFiles.hpp | 3 +-
24 files changed, 264 insertions(+), 107 deletions(-)
--- a/XMPCore/source/XMPUtils-FileInfo.cpp
+++ b/XMPCore/source/XMPUtils-FileInfo.cpp
@@ -782,9 +782,12 @@ AppendSubtree ( const XMP_Node * sourceN
for ( size_t sourceNum = 0, sourceLim = sourceNode->children.size(); sourceNum != sourceLim && destNode!= NULL; ++sourceNum ) {
const XMP_Node * sourceField = sourceNode->children[sourceNum];
AppendSubtree ( sourceField, destNode, mergeCompound, replaceOld, deleteEmpty );
- if ( deleteEmpty && destNode->children.empty() ) {
- delete ( destNode );
- destParent->children.erase ( destPos );
+
+ if (deleteEmpty && destNode->children.empty())
+ {
+ delete (destNode);
+ destNode = NULL;
+ destParent->children.erase(destPos);
}
}
--- a/XMPFiles/source/FileHandlers/FLV_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/FLV_Handler.cpp
@@ -210,6 +210,8 @@ static void GetTagInfo ( XMP_IO* fileRef
static XMP_Uns32 GetASValueLen ( const XMP_Uns8 * asValue, const XMP_Uns8 * asLimit )
{
+ if (asValue > asLimit)
+ return 0;
XMP_Uns32 valueLen = 0;
const XMP_Uns8 * itemPtr;
XMP_Uns32 arrayCount;
--- a/XMPFiles/source/FileHandlers/P2_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/P2_Handler.cpp
@@ -1129,6 +1129,7 @@ void P2_MetaHandler::ProcessXMP()
XML_NodePtr legacyContext, clipMetadata, legacyProp;
if ( ! this->p2ClipManager.IsValidP2() ) return;
P2_Clip* p2Clip=this->p2ClipManager.GetManagedClip();
+ if( p2Clip->GetP2RootNode() == 0) return;
XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
std::string oldDigest, newDigest;
bool digestFound = this->xmpObj.GetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "P2", &oldDigest, 0 );
@@ -1299,24 +1300,27 @@ void P2_MetaHandler::UpdateFile ( bool d
if (frameFormat == "50Timecode" || frameFormat == "5994DropTimecode" || frameFormat == "5994NonDropTimecode")
{
p2Clip = this->p2ClipManager.GetManagedClip();
- XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
- XML_NodePtr legacyVideoContext = p2Clip->GetEssenceListNode();
- if (legacyVideoContext != 0)
+ if( p2Clip->GetP2RootNode() != 0 )
{
- legacyVideoContext = legacyVideoContext->GetNamedElement(p2NS, "Video");
- XML_NodePtr legacyProp = legacyVideoContext->GetNamedElement(p2NS, "StartTimecode");
- if ((legacyProp != 0) && legacyProp->IsLeafContentNode())
- {
- AdjustTimeCode( xmpStartTimeCode, true );
- if (xmpStartTimeCode != legacyProp->GetLeafContentValue())
- {
- legacyProp->SetLeafContentValue(xmpStartTimeCode.c_str());
- updateLegacyXML = true;
- }
- }
- }
- }
- }
+ XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+ XML_NodePtr legacyVideoContext = p2Clip->GetEssenceListNode();
+ if (legacyVideoContext != 0)
+ {
+ legacyVideoContext = legacyVideoContext->GetNamedElement(p2NS, "Video");
+ XML_NodePtr legacyProp = legacyVideoContext->GetNamedElement(p2NS, "StartTimecode");
+ if ((legacyProp != 0) && legacyProp->IsLeafContentNode())
+ {
+ AdjustTimeCode( xmpStartTimeCode, true );
+ if (xmpStartTimeCode != legacyProp->GetLeafContentValue())
+ {
+ legacyProp->SetLeafContentValue(xmpStartTimeCode.c_str());
+ updateLegacyXML = true;
+ }
+ }
+ }
+ }
+ }
+ }
std::string newDigest;
this->p2ClipManager.GetManagedClip()->CreateDigest ( &newDigest );
--- a/XMPFiles/source/FileHandlers/PSD_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/PSD_Handler.cpp
@@ -140,7 +140,13 @@ void PSD_MetaHandler::CacheFileData()
cmLen = GetUns32BE ( &psdHeader[26] );
- XMP_Int64 psirOrigin = 26 + 4 + cmLen;
+ XMP_Int64 psirOrigin = 26 + 4 + static_cast<XMP_Int64>(cmLen);
+ XMP_Int64 fileLength = fileRef->Length();
+
+ if (psirOrigin > fileLength)
+ {
+ XMP_Throw("Invalid PSD chunk length", kXMPErr_BadPSD);
+ }
filePos = fileRef->Seek ( psirOrigin, kXMP_SeekFromStart );
if ( filePos != psirOrigin ) return; // Throw?
@@ -151,7 +157,9 @@ void PSD_MetaHandler::CacheFileData()
this->psirMgr.ParseFileResources ( fileRef, psirLen );
PSIR_Manager::ImgRsrcInfo xmpInfo;
- bool found = this->psirMgr.GetImgRsrc ( kPSIR_XMP, &xmpInfo );
+ bool found = this->psirMgr.GetImgRsrc(kPSIR_XMP, &xmpInfo);
+ if (psirLen < xmpInfo.dataLen)
+ return;
if ( found ) {
@@ -425,4 +433,4 @@ void PSD_MetaHandler::WriteTempFile ( XM
} // PSD_MetaHandler::WriteTempFile
-// =================================================================================================
+// =================================================================================================
\ No newline at end of file
--- a/XMPFiles/source/FileHandlers/SWF_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/SWF_Handler.cpp
@@ -139,6 +139,7 @@ void SWF_MetaHandler::CacheFileData() {
// Look for the FileAttributes and Metadata tags.
+ if(this->expandedSize <= SWF_IO::HeaderPrefixSize ) return; // Throw?
this->firstTagOffset = SWF_IO::FileHeaderSize ( this->expandedSWF[SWF_IO::HeaderPrefixSize] );
XMP_Uns32 currOffset = this->firstTagOffset;
@@ -235,6 +236,9 @@ void SWF_MetaHandler::UpdateFile ( bool
PutUns16LE ( ((SWF_IO::FileAttributesTagID << 6) | 4), &buffer[0] );
PutUns32LE ( SWF_IO::HasMetadataMask, &buffer[2] );
+ if(this->expandedSWF.size() < this->firstTagOffset ){
+ XMP_Throw ( "Index not valid.Invalid SWF, can't update.", kXMPErr_BadIndex );
+ }
this->expandedSWF.insert ( (this->expandedSWF.begin() + this->firstTagOffset), 6, 0 );
memcpy ( &this->expandedSWF[this->firstTagOffset], &buffer[0], 6 );
@@ -271,6 +275,9 @@ void SWF_MetaHandler::UpdateFile ( bool
this->metadataTag.tagOffset += attrTagLength; // The FileAttributes tag will become in front.
}
+ if(this->expandedSWF.size() < this->firstTagOffset ){
+ XMP_Throw ( "Index not valid.Invalid SWF, can't update.", kXMPErr_BadIndex );
+ }
this->expandedSWF.insert ( (this->expandedSWF.begin() + this->firstTagOffset), attrTagLength, 0 );
memcpy ( &this->expandedSWF[this->firstTagOffset], &attrTag[0], attrTagLength );
@@ -301,6 +308,9 @@ void SWF_MetaHandler::UpdateFile ( bool
this->metadataTag.contentLength = this->xmpPacket.size();
XMP_Uns32 newMetaLength = 6 + this->metadataTag.contentLength; // Always use a long tag header.
+ if(this->expandedSWF.size() < this->metadataTag.tagOffset ){
+ XMP_Throw ( "Index not valid.Invalid SWF, can't update.", kXMPErr_BadIndex );
+ }
this->expandedSWF.insert ( (this->expandedSWF.begin() + this->metadataTag.tagOffset), newMetaLength, 0 );
PutUns16LE ( ((SWF_IO::MetadataTagID << 6) | SWF_IO::TagLengthMask), &this->expandedSWF[this->metadataTag.tagOffset] );
--- a/XMPFiles/source/FileHandlers/UCF_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/UCF_Handler.cpp
@@ -486,6 +486,9 @@ void UCF_MetaHandler::CacheFileData()
}
have = CHUNK - strm.avail_out;
+ if ((bytesWritten + have) > sizeUncompressed){
+ XMP_Throw("UCF Bad XMP block", kXMPErr_BadBlockFormat);
+ }
memcpy( (unsigned char*) packetStr + bytesWritten , out , have );
bytesWritten += have;
@@ -547,7 +550,6 @@ void UCF_MetaHandler::UpdateFile ( bool
uncomprPacketLen = (XMP_StringLen) xmpPacket.size();
finalPacketStr = uncomprPacketStr; // will be overriden if compressedXMP==true
finalPacketLen = uncomprPacketLen;
- std::string compressedPacket; // moot if non-compressed, still here for scope reasons (having to keep a .c_str() alive)
if ( !x ) // if new XMP...
{
@@ -584,6 +586,9 @@ void UCF_MetaHandler::UpdateFile ( bool
unsigned int have;
z_stream strm;
unsigned char out[CHUNK];
+ /* initilalisation for fix to CTECHXMP-4170441*/
+ strm.total_out = 0;
+ strm.total_in = 0;
/* allocate deflate state */
strm.zalloc = Z_NULL; strm.zfree = Z_NULL; strm.opaque = Z_NULL;
--- a/XMPFiles/source/FileHandlers/UCF_Handler.hpp
+++ b/XMPFiles/source/FileHandlers/UCF_Handler.hpp
@@ -710,6 +710,7 @@ private:
XMP_StringLen uncomprPacketLen;
XMP_StringPtr finalPacketStr;
XMP_StringLen finalPacketLen;
+ std::string compressedPacket;
std::vector<CDFileHeader> cdEntries;
EndOfCD endOfCD;
void writeOut( XMP_IO* sourceFile, XMP_IO* targetFile, bool isRewrite, bool isInPlace);
--- a/XMPFiles/source/FormatSupport/ASF_Support.cpp
+++ b/XMPFiles/source/FormatSupport/ASF_Support.cpp
@@ -145,10 +145,11 @@ bool ASF_Support::ReadHeaderObject ( XMP
pos += bufferSize;
// read contained header objects
- /*XMP_Uns32 numberOfHeaders = GetUns32LE ( &buffer[24] );*/
+ XMP_Uns32 numberOfHeaders = GetUns32LE ( &buffer[24] );
ASF_ObjectBase objectBase;
- while ( read < newObject.len ) {
+ while (read < newObject.len && numberOfHeaders > 0)
+ {
fileRef->Seek ( pos, kXMP_SeekFromStart );
if ( kASF_ObjectBaseLen != fileRef->Read ( &objectBase, kASF_ObjectBaseLen, true ) ) break;
@@ -226,7 +227,7 @@ bool ASF_Support::ReadHeaderObject ( XMP
XMP_Uns32 fieldPos = 28;
// copyright URL is 3. element with variable size
- for ( int i = 1; i <= 3 ; ++i ) {
+ for ( int i = 1; i <= 3 && fieldPos < buffer.size() ; ++i ) {
XMP_Uns32 len = GetUns32LE ( &buffer[fieldPos] );
if ( i == 3 ) {
std::string copyrightURLStr = buffer.substr ( fieldPos + 4, len );
@@ -276,8 +277,8 @@ bool ASF_Support::ReadHeaderObject ( XMP
pos += objectBase.size;
read += objectBase.size;
+ numberOfHeaders--;
}
-
} catch ( ... ) {
return false;
@@ -316,7 +317,7 @@ bool ASF_Support::WriteHeaderObject ( XM
pos += bufferSize;
// read contained header objects
- /*XMP_Uns32 numberOfHeaders = GetUns32LE ( &buffer[24] );*/
+ XMP_Uns32 numberOfHeaders = GetUns32LE ( &buffer[24] );
ASF_ObjectBase objectBase;
// prepare new header in memory
@@ -328,7 +329,7 @@ bool ASF_Support::WriteHeaderObject ( XM
header.append ( buffer.c_str(), bufferSize );
- while ( read < object.len ) {
+ while ( read < object.len && numberOfHeaders > 0 ) {
sourceRef->Seek ( pos, kXMP_SeekFromStart );
if ( kASF_ObjectBaseLen != sourceRef->Read ( &objectBase, kASF_ObjectBaseLen, true ) ) break;
@@ -503,7 +504,7 @@ bool ASF_Support::WriteHeaderObject ( XM
pos += objectBase.size;
read += objectBase.size;
-
+ numberOfHeaders--;
writtenObjects ++;
}
--- a/XMPFiles/source/FormatSupport/ID3_Support.cpp
+++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp
@@ -462,7 +462,7 @@ ID3v2Frame::ID3v2Frame ( XMP_Uns32 id_ )
void ID3v2Frame::release()
{
- if ( this->content != 0 ) delete [] this->content;
+ if ( this->content != 0 ) delete [] content;
this->content = 0;
this->contentSize = 0;
}
--- a/XMPFiles/source/FormatSupport/P2_Support.cpp
+++ b/XMPFiles/source/FormatSupport/P2_Support.cpp
@@ -108,7 +108,10 @@ void P2_Clip::CacheClipContent()
{
if (headContentCached) return;
headContentCached = true;
- XMP_StringPtr p2NameSpace=GetP2RootNode()->ns.c_str();
+ XML_NodePtr p2RootNode = GetP2RootNode();
+ if( p2RootNode == 0 ) return;
+ XMP_StringPtr p2NameSpace = p2RootNode->ns.c_str();
+
p2ClipContent = GetP2RootNode()->GetNamedElement ( p2NameSpace, "ClipContent" );
if ( p2ClipContent == 0 ) return;
XML_NodePtr p2node;
@@ -356,7 +359,9 @@ void P2_SpannedClip::CreateDigest ( std:
digestStr->erase();
if ( this->headContent.clipMetadata == 0 ) return; // Bail if we don't have any legacy XML.
- XMP_StringPtr p2NS = this->GetP2RootNode()->ns.c_str();
+ XML_NodePtr p2RootNode = this->GetP2RootNode(); // Return if there is no root node.
+ if( p2RootNode == 0 ) return;
+ XMP_StringPtr p2NS = p2RootNode->ns.c_str();
XML_NodePtr legacyContext;
MD5_CTX md5Context;
unsigned char digestBin [16];
--- a/XMPFiles/source/FormatSupport/PostScript_Support.cpp
+++ b/XMPFiles/source/FormatSupport/PostScript_Support.cpp
@@ -1014,14 +1014,7 @@ std::string PostScript_Support::ConvertT
if(itr!=tokenzs.end())
{
++itr;
- if (itr == tokenzs.end())
- {
- // bug 101914 - corrupt file make us
- // reach the end. -- Hub
- // https://bugs.freedesktop.org/show_bug.cgi?id=101914
- break;
- }
- if (itr->noOfDelimiter==0 && IsNumeric(itr->token[0]) )
+ if (itr<tokenzs.end() && itr->noOfDelimiter==0 && IsNumeric(itr->token[0]) )
{
const char * str=itr->token.c_str();
short day= GetNumber(&str);
@@ -1030,6 +1023,10 @@ std::string PostScript_Support::ConvertT
date.day=day;
}
}
+ else if (itr == tokenzs.end())
+ {
+ break;
+ }
}
}
}
--- a/XMPFiles/source/FormatSupport/RIFF.cpp
+++ b/XMPFiles/source/FormatSupport/RIFF.cpp
@@ -185,6 +185,10 @@ Chunk::Chunk( ContainerChunk* parent_, R
bool repairFile = XMP_OptionIsSet ( handler->parent->openFlags, kXMPFiles_OpenRepairFile );
if ( (! isUpdate) || (repairFile && (parent_ == 0)) ) {
this->oldSize = chunkLimit - this->oldPos;
+ if (this->oldSize < 8)
+ {
+ XMP_Throw("Invalid RIFF chunk size", kXMPErr_BadFileFormat);
+ }
} else {
XMP_Throw ( "Bad RIFF chunk size", kXMPErr_BadFileFormat );
}
--- a/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp
+++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp
@@ -85,7 +85,7 @@ extern void ExportPhotoData ( XMP_FileFo
// Here are the primary (0th) IFD tags that get special treatment:
//
// 270, 33432 - ASCII mapped to alt-text['x-default']
-// 306 - DateTime master
+// 306 - DateTime main
// 315 - ASCII mapped to text seq[1]
//
// Here are the primary (0th) IFD tags that get mapped by type and count:
@@ -97,7 +97,7 @@ extern void ExportPhotoData ( XMP_FileFo
//
// 34856, 41484 - OECF/SFR table
// 36864, 40960 - 4 ASCII chars to text
-// 36867, 36868 - DateTime master
+// 36867, 36868 - DateTime main
// 37121 - 4 UInt8 to integer seq
// 37385 - Flash struct
// 37510 - explicitly encoded text to alt-text['x-default']
@@ -114,8 +114,8 @@ extern void ExportPhotoData ( XMP_FileFo
// Here are the GPS IFD tags that get special treatment:
//
// 0 - 4 UInt8 to text "n.n.n.n"
-// 2, 4, 20, 22 - Latitude or longitude master
-// 7 - special DateTime master, the time part
+// 2, 4, 20, 22 - Latitude or longitude main
+// 7 - special DateTime main, the time part
// 27, 28 - explicitly encoded text
//
// Here are the GPS IFD tags that get mapped by type and count:
@@ -161,7 +161,7 @@ extern void ExportPhotoData ( XMP_FileFo
// 296 SHORT 1 ResolutionUnit integer
// 301 SHORT 3*256 TransferFunction integer seq
// 305 ASCII Any Software text, xmp:CreatorTool
-// 306 ASCII 20 DateTime date, master of 37520, xmp:DateTime
+// 306 ASCII 20 DateTime date, main of 37520, xmp:DateTime
// 315 ASCII Any Artist text, dc:creator[1]
// 318 RATIONAL 2 WhitePoint rational seq
// 319 RATIONAL 6 PrimaryChromaticities rational seq
@@ -181,8 +181,8 @@ extern void ExportPhotoData ( XMP_FileFo
// 34855 SHORT Any ISOSpeedRatings integer seq
// 34856 UNDEFINED Any OECF OECF/SFR table
// 36864 UNDEFINED 4 ExifVersion text, Exif has 4 ASCII chars
-// 36867 ASCII 20 DateTimeOriginal date, master of 37521
-// 36868 ASCII 20 DateTimeDigitized date, master of 37522
+// 36867 ASCII 20 DateTimeOriginal date, main of 37521
+// 36868 ASCII 20 DateTimeDigitized date, main of 37522
// 37121 UNDEFINED 4 ComponentsConfiguration integer seq, Exif has 4 UInt8
// 37122 RATIONAL 1 CompressedBitsPerPixel rational
// 37377 SRATIONAL 1 ShutterSpeedValue rational
@@ -235,12 +235,12 @@ extern void ExportPhotoData ( XMP_FileFo
//
// 0 BYTE 4 GPSVersionID text, "n.n.n.n", Exif has 4 UInt8
// 1 ASCII 2 GPSLatitudeRef latitude, with 2
-// 2 RATIONAL 3 GPSLatitude latitude, master of 2
+// 2 RATIONAL 3 GPSLatitude latitude, main of 2
// 3 ASCII 2 GPSLongitudeRef longitude, with 4
-// 4 RATIONAL 3 GPSLongitude longitude, master of 3
+// 4 RATIONAL 3 GPSLongitude longitude, main of 3
// 5 BYTE 1 GPSAltitudeRef integer
// 6 RATIONAL 1 GPSAltitude rational
-// 7 RATIONAL 3 GPSTimeStamp date, master of 29
+// 7 RATIONAL 3 GPSTimeStamp date, main of 29
// 8 ASCII Any GPSSatellites text
// 9 ASCII 2 GPSStatus text
// 10 ASCII 2 GPSMeasureMode text
@@ -253,9 +253,9 @@ extern void ExportPhotoData ( XMP_FileFo
// 17 RATIONAL 1 GPSImgDirection rational
// 18 ASCII Any GPSMapDatum text
// 19 ASCII 2 GPSDestLatitudeRef latitude, with 20
-// 20 RATIONAL 3 GPSDestLatitude latitude, master of 19
+// 20 RATIONAL 3 GPSDestLatitude latitude, main of 19
// 21 ASCII 2 GPSDestLongitudeRef longitude, with 22
-// 22 RATIONAL 3 GPSDestLongitude logitude, master of 21
+// 22 RATIONAL 3 GPSDestLongitude logitude, main of 21
// 23 ASCII 2 GPSDestBearingRef text
// 24 RATIONAL 1 GPSDestBearing rational
// 25 ASCII 2 GPSDestDistanceRef text
--- a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp
+++ b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp
@@ -116,6 +116,9 @@ static const TIFF_MappingToXMP sExifIFDM
{ /* 40964 */ kTIFF_RelatedSoundFile, kTIFF_ASCIIType, kAnyCount, kExport_Always, kXMP_NS_EXIF, "RelatedSoundFile" }, // ! Exif spec says count of 13.
{ /* 36867 */ kTIFF_DateTimeOriginal, kTIFF_ASCIIType, 20, kExport_Always, "", "" }, // ! Has a special mapping.
{ /* 36868 */ kTIFF_DateTimeDigitized, kTIFF_ASCIIType, 20, kExport_Always, "", "" }, // ! Has a special mapping.
+ { /* 36880 */ kTIFF_OffsetTime, kTIFF_ASCIIType, 7, kExport_Always, "", "" }, // ! Has a special mapping.
+ { /* 36881 */ kTIFF_OffsetTimeOriginal, kTIFF_ASCIIType, 7, kExport_Always, "", "" }, // ! Has a special mapping.
+ { /* 36882 */ kTIFF_OffsetTimeDigitized, kTIFF_ASCIIType, 7, kExport_Always, "", "" }, // ! Has a special mapping.
{ /* 42016 */ kTIFF_ImageUniqueID, kTIFF_ASCIIType, 33, kExport_InjectOnly, kXMP_NS_EXIF, "ImageUniqueID" },
{ /* 42032 */ kTIFF_CameraOwnerName, kTIFF_ASCIIType, kAnyCount, kExport_InjectOnly, kXMP_NS_ExifEX, "CameraOwnerName" },
{ /* 42033 */ kTIFF_BodySerialNumber, kTIFF_ASCIIType, kAnyCount, kExport_InjectOnly, kXMP_NS_ExifEX, "BodySerialNumber" },
@@ -1248,6 +1251,14 @@ ImportTIFF_StandardMappings ( XMP_Uns8 i
bool found = tiff.GetTag ( ifd, mapInfo.id, &tagInfo );
if ( ! found ) continue;
+ /* tag length need to be checked in case of TIFF_MemoryReader, as a possible case
+ the data length value might be changed (flippig because of endianess) by next overlapping IFD leading to crash.
+ To avoid that, rechecking the datalen just before its access. Fixing CTECHXMP-4170409*/
+ if(tiff.IsCheckTagLength() &&
+ tagInfo.dataLen > tiff.GetTiffLength() - ((XMP_Uns8*)tagInfo.dataPtr - tiff.GetTiffStream())) {
+ continue; // Bad Tag
+ }
+
XMP_Assert ( tagInfo.type != kTIFF_UndefinedType ); // These must have a special mapping.
if ( tagInfo.type == kTIFF_UndefinedType ) continue;
@@ -1277,7 +1288,7 @@ ImportTIFF_StandardMappings ( XMP_Uns8 i
// ImportTIFF_Date
// ===============
//
-// Convert an Exif 2.2 master date/time tag plus associated fractional seconds to an XMP date/time.
+// Convert an Exif 2.2 main date/time tag plus associated fractional seconds to an XMP date/time.
// The Exif date/time part is a 20 byte ASCII value formatted as "YYYY:MM:DD HH:MM:SS" with a
// terminating nul. Any of the numeric portions can be blanks if unknown. The fractional seconds
// are a nul terminated ASCII string with possible space padding. They are literally the fractional
@@ -1287,11 +1298,14 @@ static void
ImportTIFF_Date ( const TIFF_Manager & tiff, const TIFF_Manager::TagInfo & dateInfo,
SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
{
- XMP_Uns16 secID = 0;
+ XMP_Uns16 secID = 0, offsetID = 0;
switch ( dateInfo.id ) {
- case kTIFF_DateTime : secID = kTIFF_SubSecTime; break;
- case kTIFF_DateTimeOriginal : secID = kTIFF_SubSecTimeOriginal; break;
- case kTIFF_DateTimeDigitized : secID = kTIFF_SubSecTimeDigitized; break;
+ case kTIFF_DateTime : secID = kTIFF_SubSecTime;
+ offsetID = kTIFF_OffsetTime; break;
+ case kTIFF_DateTimeOriginal : secID = kTIFF_SubSecTimeOriginal;
+ offsetID = kTIFF_OffsetTimeOriginal; break;
+ case kTIFF_DateTimeDigitized : secID = kTIFF_SubSecTimeDigitized;
+ offsetID = kTIFF_OffsetTimeDigitized; break;
}
try { // Don't let errors with one stop the others.
@@ -1332,7 +1346,31 @@ ImportTIFF_Date ( const TIFF_Manager & t
for ( ; digits < 9; ++digits ) binValue.nanoSecond *= 10;
if ( binValue.nanoSecond != 0 ) binValue.hasTime = true;
}
+ // The offset time tags were added to EXIF spec 2.3.1., therefore we not
+ // supporting read/write in older versions
+ // We need EXIF spec version to figure out the same.
+ bool haveOldExif = true; // Default to old Exif if no version tag.
+ TIFF_Manager::TagInfo tagInfo;
+ bool foundExif = tiff.GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, &tagInfo );
+ if ( foundExif && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+ haveOldExif = (strncmp ( (char*)tagInfo.dataPtr, "0231", 4 ) < 0);
+ }
+
+ if (!haveOldExif)
+ {
+ TIFF_Manager::TagInfo timezoneInfo;
+ found = tiff.GetTag ( kTIFF_ExifIFD, offsetID, &timezoneInfo );
+ if ( found && (timezoneInfo.type == kTIFF_ASCIIType) && (timezoneInfo.count == 7) ) {
+ const char * timezoneStr = (const char *) timezoneInfo.dataPtr;
+ if ( (timezoneStr[0] == '+') || (timezoneStr[0] == '-') || (timezoneStr[3] == ':') ) {
+ binValue.tzSign = (timezoneStr[0] == '-') ? -1 : 1;
+ binValue.tzHour = GatherInt ( &timezoneStr[1], 2 );
+ binValue.tzMinute = GatherInt ( &timezoneStr[4], 2 );
+ binValue.hasTimeZone = true;
+ }
+ }
+ }
xmp->SetProperty_Date ( xmpNS, xmpProp, binValue );
} catch ( ... ) {
@@ -2205,13 +2243,13 @@ PhotoDataUtils::Import2WayExif ( const T
xmp->SetProperty ( kXMP_NS_EXIF, "GPSVersionID", strOut );
}
- // 2 GPSLatitude is a GPS coordinate master.
+ // 2 GPSLatitude is a GPS coordinate main.
found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSLatitude, &tagInfo );
if ( found ) {
ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSLatitude" );
}
- // 4 GPSLongitude is a GPS coordinate master.
+ // 4 GPSLongitude is a GPS coordinate main.
found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSLongitude, &tagInfo );
if ( found ) {
ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSLongitude" );
@@ -2223,13 +2261,13 @@ PhotoDataUtils::Import2WayExif ( const T
ImportTIFF_GPSTimeStamp ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSTimeStamp" );
}
- // 20 GPSDestLatitude is a GPS coordinate master.
+ // 20 GPSDestLatitude is a GPS coordinate main.
found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDestLatitude, &tagInfo );
if ( found ) {
ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSDestLatitude" );
}
- // 22 GPSDestLongitude is a GPS coordinate master.
+ // 22 GPSDestLongitude is a GPS coordinate main.
found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDestLongitude, &tagInfo );
if ( found ) {
ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSDestLongitude" );
@@ -2665,7 +2703,7 @@ ExportTIFF_StandardMappings ( XMP_Uns8 i
// ExportTIFF_Date
// ===============
//
-// Convert an XMP date/time to an Exif 2.2 master date/time tag plus associated fractional seconds.
+// Convert an XMP date/time to an Exif 2.2 main date/time tag plus associated fractional seconds.
// The Exif date/time part is a 20 byte ASCII value formatted as "YYYY:MM:DD HH:MM:SS" with a
// terminating nul. The fractional seconds are a nul terminated ASCII string with possible space
// padding. They are literally the fractional part, the digits that would be to the right of the
@@ -2676,10 +2714,18 @@ ExportTIFF_Date ( const SXMPMeta & xmp,
{
XMP_Uns8 mainIFD = kTIFF_ExifIFD;
XMP_Uns16 fracID=0;
+ XMP_Uns16 offsetID=0;
switch ( mainID ) {
- case kTIFF_DateTime : mainIFD = kTIFF_PrimaryIFD; fracID = kTIFF_SubSecTime; break;
- case kTIFF_DateTimeOriginal : fracID = kTIFF_SubSecTimeOriginal; break;
- case kTIFF_DateTimeDigitized : fracID = kTIFF_SubSecTimeDigitized; break;
+ case kTIFF_DateTime : mainIFD = kTIFF_PrimaryIFD;
+ fracID = kTIFF_SubSecTime;
+ offsetID = kTIFF_OffsetTime;
+ break;
+ case kTIFF_DateTimeOriginal : fracID = kTIFF_SubSecTimeOriginal;
+ offsetID = kTIFF_OffsetTimeOriginal;
+ break;
+ case kTIFF_DateTimeDigitized : fracID = kTIFF_SubSecTimeDigitized;
+ offsetID = kTIFF_OffsetTimeDigitized;
+ break;
}
try { // Don't let errors with one stop the others.
@@ -2689,6 +2735,7 @@ ExportTIFF_Date ( const SXMPMeta & xmp,
if ( ! foundXMP ) {
tiff->DeleteTag ( mainIFD, mainID );
tiff->DeleteTag ( kTIFF_ExifIFD, fracID ); // ! The subseconds are always in the Exif IFD.
+ tiff->DeleteTag ( kTIFF_ExifIFD, offsetID );// ! The offsetTime are always in the Exif IFD.
return;
}
@@ -2733,23 +2780,53 @@ ExportTIFF_Date ( const SXMPMeta & xmp,
if ( xmpBin.nanoSecond == 0 ) {
tiff->DeleteTag ( kTIFF_ExifIFD, fracID );
-
- } else {
-
- snprintf ( buffer, sizeof(buffer), "%09d", xmpBin.nanoSecond ); // AUDIT: Use of sizeof(buffer) is safe.
- for ( size_t i = strlen(buffer)-1; i > 0; --i ) {
- if ( buffer[i] != '0' ) break;
- buffer[i] = 0; // Strip trailing zero digits.
+ }
+ else
+ {
+ snprintf(buffer, sizeof(buffer), "%09d", xmpBin.nanoSecond); // AUDIT: Use of sizeof(buffer) is safe.
+ for (size_t i = strlen(buffer) - 1; i > 0; --i)
+ {
+ if (buffer[i] != '0')
+ break;
+ buffer[i] = 0; // Strip trailing zero digits.
}
+ tiff->SetTag_ASCII(kTIFF_ExifIFD, fracID, buffer); // ! The subseconds are always in the Exif IFD.
+ }
- tiff->SetTag_ASCII ( kTIFF_ExifIFD, fracID, buffer ); // ! The subseconds are always in the Exif IFD.
+ bool haveOldExif = true; // Default to old Exif if no version tag.
+ TIFF_Manager::TagInfo tagInfo;
+ bool foundExif = tiff->GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, &tagInfo );
+ if ( foundExif && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+ haveOldExif = (strncmp ( (char*)tagInfo.dataPtr, "0231", 4 ) < 0);
+ }
+ if (!haveOldExif)
+ {
+ // The offset time tags were added to EXIF spec 2.3.1., therefore we are not
+ // supporting read/write in older versions
+ // We need EXIF spec version to figure out the same.
+
+ if ( xmpBin.hasTimeZone == 0 || (xmpBin.tzSign != -1 && xmpBin.tzSign != 1) ){
+
+ tiff->DeleteTag ( kTIFF_ExifIFD, offsetID );
+
+ }else
+ {
+ char tzSign = '+';
+ if (xmpBin.tzSign == -1)
+ tzSign = '-';
+
+ char offsetBuffer[7];
+ snprintf(offsetBuffer, sizeof(offsetBuffer), "%c%02d:%02d", // AUDIT: Use of sizeof(offsetBuffer) is safe.
+ tzSign, xmpBin.tzHour, xmpBin.tzMinute);
+ tiff->SetTag_ASCII(kTIFF_ExifIFD, offsetID, offsetBuffer); // ! The OffsetTime are always in the Exif IFD.
+ }
}
} catch ( ... ) {
// Do nothing, let other exports proceed.
// ? Notify client?
- }
+ }
} // ExportTIFF_Date
--- a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
+++ b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
@@ -971,17 +971,17 @@ void TIFF_FileWriter::IntegrateFromPShop
} // TIFF_FileWriter::IntegrateFromPShop6
// =================================================================================================
-// TIFF_FileWriter::CopyTagToMasterIFD
+// TIFF_FileWriter::CopyTagToMainIFD
// ===================================
//
-// Create a new master IFD entry from a buried Photoshop 6 IFD entry. Don't try to get clever with
+// Create a new main IFD entry from a buried Photoshop 6 IFD entry. Don't try to get clever with
// large values, just create a new copy. This preserves a clean separation between the memory-based
// and file-based TIFF processing.
-void* TIFF_FileWriter::CopyTagToMasterIFD ( const TagInfo & ps6Tag, InternalIFDInfo * masterIFD )
+void* TIFF_FileWriter::CopyTagToMainIFD ( const TagInfo & ps6Tag, InternalIFDInfo * mainIFD )
{
InternalTagMap::value_type mapValue ( ps6Tag.id, InternalTagInfo ( ps6Tag.id, ps6Tag.type, ps6Tag.count, this->fileParsed ) );
- InternalTagMap::iterator newPos = masterIFD->tagMap.insert ( masterIFD->tagMap.end(), mapValue );
+ InternalTagMap::iterator newPos = mainIFD->tagMap.insert ( mainIFD->tagMap.end(), mapValue );
InternalTagInfo& newTag = newPos->second;
newTag.dataLen = ps6Tag.dataLen;
@@ -998,11 +998,11 @@ void* TIFF_FileWriter::CopyTagToMasterIF
newTag.changed = true; // ! See comments with ProcessPShop6IFD.
XMP_Assert ( (newTag.origDataLen == 0) && (newTag.origDataOffset == 0) );
- masterIFD->changed = true;
+ mainIFD->changed = true;
return newPos->second.dataPtr; // ! Return the address within the map entry for small values.
-} // TIFF_FileWriter::CopyTagToMasterIFD
+} // TIFF_FileWriter::CopyTagToMainIFD
// =================================================================================================
// FlipCFATable
@@ -1016,10 +1016,10 @@ static bool FlipCFATable ( void* voidPtr
XMP_Uns16* u16Ptr = (XMP_Uns16*)voidPtr;
- Flip2 ( &u16Ptr[0] ); // Flip the counts to match the master TIFF.
+ Flip2 ( &u16Ptr[0] ); // Flip the counts to match the main TIFF.
Flip2 ( &u16Ptr[1] );
- XMP_Uns16 columns = GetUns16 ( &u16Ptr[0] ); // Fetch using the master TIFF's routine.
+ XMP_Uns16 columns = GetUns16 ( &u16Ptr[0] ); // Fetch using the main TIFF's routine.
XMP_Uns16 rows = GetUns16 ( &u16Ptr[1] );
if ( tagLen != (XMP_Uns32)(4 + columns*rows) ) return false;
@@ -1061,10 +1061,10 @@ static bool FlipOECFSFRTable ( void* voi
{
XMP_Uns16* u16Ptr = (XMP_Uns16*)voidPtr;
- Flip2 ( &u16Ptr[0] ); // Flip the data to match the master TIFF.
+ Flip2 ( &u16Ptr[0] ); // Flip the data to match the main TIFF.
Flip2 ( &u16Ptr[1] );
- XMP_Uns16 columns = GetUns16 ( &u16Ptr[0] ); // Fetch using the master TIFF's routine.
+ XMP_Uns16 columns = GetUns16 ( &u16Ptr[0] ); // Fetch using the main TIFF's routine.
XMP_Uns16 rows = GetUns16 ( &u16Ptr[1] );
XMP_Uns32 minLen = 4 + columns + (8 * columns * rows); // Minimum legit tag size.
@@ -1111,25 +1111,25 @@ void TIFF_FileWriter::ProcessPShop6IFD (
bool needsFlipping = (this->bigEndian != buriedExif.IsBigEndian());
- InternalIFDInfo* masterIFD = &this->containedIFDs[ifd];
+ InternalIFDInfo* mainIFD = &this->containedIFDs[ifd];
TagInfoMap::const_iterator ps6Pos = ps6IFD.begin();
TagInfoMap::const_iterator ps6End = ps6IFD.end();
for ( ; ps6Pos != ps6End; ++ps6Pos ) {
- // Copy buried tags to the master IFD if they don't already exist there.
+ // Copy buried tags to the main IFD if they don't already exist there.
const TagInfo& ps6Tag = ps6Pos->second;
- if ( this->FindTagInIFD ( ifd, ps6Tag.id ) != 0 ) continue; // Keep existing master tags.
+ if ( this->FindTagInIFD ( ifd, ps6Tag.id ) != 0 ) continue; // Keep existing main tags.
if ( needsFlipping && (ps6Tag.id == 37500) ) continue; // Don't copy an unflipped MakerNote.
if ( (ps6Tag.id == kTIFF_ExifIFDPointer) || // Skip the tags that are explicit offsets.
(ps6Tag.id == kTIFF_GPSInfoIFDPointer) ||
(ps6Tag.id == kTIFF_JPEGInterchangeFormat) ||
(ps6Tag.id == kTIFF_InteroperabilityIFDPointer) ) continue;
- void* voidPtr = this->CopyTagToMasterIFD ( ps6Tag, masterIFD );
+ void* voidPtr = this->CopyTagToMainIFD ( ps6Tag, mainIFD );
if ( needsFlipping ) {
switch ( ps6Tag.type ) {
@@ -1509,8 +1509,9 @@ void TIFF_FileWriter::UpdateMemByAppend
if ( (appendAll | currTag.changed) && (currTag.dataLen > 4) ) {
XMP_Uns32 valueOffset = this->GetUns32 ( &currTag.smallValue );
+ bool inplaceUpdate = (currTag.dataLen <= currTag.origDataLen) && (! appendAll);
- if ( (currTag.dataLen <= currTag.origDataLen) && (! appendAll) ) {
+ if ( inplaceUpdate ) {
XMP_Assert ( valueOffset == currTag.origDataOffset );
} else {
XMP_Assert ( valueOffset == appendedOffset );
@@ -1520,7 +1521,10 @@ void TIFF_FileWriter::UpdateMemByAppend
XMP_Assert ( valueOffset <= newLength ); // Provably true, valueOffset is in the old span, newLength is the new bigger span.
if ( currTag.dataLen > (newLength - valueOffset) ) XMP_Throw ( "Buffer overrun", kXMPErr_InternalFailure );
memcpy ( (newStream + valueOffset), currTag.dataPtr, currTag.dataLen ); // AUDIT: Protected by the above check.
- if ( (currTag.dataLen & 1) != 0 ) newStream[valueOffset+currTag.dataLen] = 0;
+ if ( !inplaceUpdate && ((currTag.dataLen & 1) != 0) ) {
+ newStream[valueOffset+currTag.dataLen] = 0;
+
+ }
}
--- a/XMPFiles/source/FormatSupport/TIFF_Support.hpp
+++ b/XMPFiles/source/FormatSupport/TIFF_Support.hpp
@@ -97,9 +97,9 @@ enum { // Constants for the type field o
static const size_t kTIFF_TypeSizes[] = { 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 4 };
-static const bool kTIFF_IsIntegerType[] = { 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0 };
-static const bool kTIFF_IsRationalType[] = { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 };
-static const bool kTIFF_IsFloatType[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
+static const bool kTIFF_IsIntegerType[] = { 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0 ,0 };
+static const bool kTIFF_IsRationalType[] = { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 ,0 };
+static const bool kTIFF_IsFloatType[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 ,0 };
enum { // Encodings for SetTag_EncodedString.
kTIFF_EncodeUndefined = 0,
@@ -187,6 +187,9 @@ enum {
kTIFF_RelatedSoundFile = 40964,
kTIFF_DateTimeOriginal = 36867,
kTIFF_DateTimeDigitized = 36868,
+ kTIFF_OffsetTime = 36880,
+ kTIFF_OffsetTimeOriginal = 36881,
+ kTIFF_OffsetTimeDigitized = 36882,
kTIFF_SubSecTime = 37520,
kTIFF_SubSecTimeOriginal = 37521,
kTIFF_SubSecTimeDigitized = 37522,
@@ -360,6 +363,9 @@ static const XMP_Uns16 sKnownExifIFDTags
kTIFF_ExifVersion, // 36864
kTIFF_DateTimeOriginal, // 36867
kTIFF_DateTimeDigitized, // 36868
+ kTIFF_OffsetTime, // 36880
+ kTIFF_OffsetTimeOriginal, // 36881
+ kTIFF_OffsetTimeDigitized, // 36882
kTIFF_ComponentsConfiguration, // 37121
kTIFF_CompressedBitsPerPixel, // 37122
kTIFF_ShutterSpeedValue, // 37377
@@ -512,6 +518,8 @@ public:
bool IsBigEndian() const { return this->bigEndian; };
bool IsLittleEndian() const { return (! this->bigEndian); };
bool IsNativeEndian() const { return this->nativeEndian; };
+ bool IsCheckTagLength () const { return this->checkTagLength; }
+
// ---------------------------------------------------------------------------------------------
// The TIFF_Manager only keeps explicit knowledge of up to 4 IFDs:
@@ -557,6 +565,9 @@ public:
// new tag will have type short or long.
virtual bool GetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const = 0;
+ virtual XMP_Uns32 GetTiffLength() const = 0;
+
+ virtual XMP_Uns8 *GetTiffStream() const = 0;
void SetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32 data );
@@ -671,6 +682,7 @@ public:
protected:
bool bigEndian, nativeEndian;
+ bool checkTagLength { false };
XMP_Uns32 CheckTIFFHeader ( const XMP_Uns8* tiffPtr, XMP_Uns32 length );
// The pointer is to a buffer of the first 8 bytes. The length is the overall length, used
@@ -732,6 +744,9 @@ public:
bool GetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr* dataPtr, XMP_StringLen* dataLen ) const;
bool GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const;
+ XMP_Uns32 GetTiffLength() const { return tiffLength; }
+
+ XMP_Uns8 *GetTiffStream() const { return tiffStream; }
void SetTag_EncodedString ( XMP_Uns8 /*ifd*/, XMP_Uns16 /*id*/, const std::string& /*utf8Str*/, XMP_Uns8 /*encoding*/ ) { NotAppropriate(); };
@@ -747,7 +762,9 @@ public:
XMP_Uns32 UpdateMemoryStream ( void** dataPtr, bool condenseStream = false ) { IgnoreParam(condenseStream); if ( dataPtr != 0 ) *dataPtr = tiffStream; return tiffLength; };
void UpdateFileStream ( XMP_IO* /*fileRef*/, XMP_ProgressTracker* /*progressTracker*/ ) { NotAppropriate(); };
- TIFF_MemoryReader() : ownedStream(false), tiffStream(0), tiffLength(0) {};
+ TIFF_MemoryReader() : ownedStream(false), tiffStream(0), tiffLength(0) {
+ checkTagLength = true;
+ };
virtual ~TIFF_MemoryReader() { if ( this->ownedStream ) free ( this->tiffStream ); };
@@ -847,6 +864,9 @@ public:
bool GetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr* dataPtr, XMP_StringLen* dataLen ) const;
bool GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const;
+ XMP_Uns32 GetTiffLength() const { return tiffLength; }
+
+ XMP_Uns8 *GetTiffStream() const { return memStream; }
void SetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, const std::string& utf8Str, XMP_Uns8 encoding );
@@ -966,7 +986,7 @@ private:
void ProcessPShop6IFD ( const TIFF_MemoryReader& buriedExif, XMP_Uns8 ifd );
- void* CopyTagToMasterIFD ( const TagInfo& ps6Tag, InternalIFDInfo* masterIFD );
+ void* CopyTagToMainIFD ( const TagInfo& ps6Tag, InternalIFDInfo* mainIFD );
void PreflightIFDLinkage();
--- a/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp
+++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp
@@ -23,8 +23,9 @@ XMPFileHandler( _parent ), mObject( obje
FileHandlerInstance::~FileHandlerInstance()
{
WXMP_Error error;
- mHandler->getModule()->getPluginAPIs()->mTerminateSessionProc( this->mObject, &error );
- PluginManager::removeHandlerInstance( this->mObject );
+
+ PluginManager::removeHandlerInstance(this->mObject);
+ mHandler->getModule()->getPluginAPIs()->mTerminateSessionProc(this->mObject, &error);
CheckError( error );
}
--- a/XMPFiles/source/WXMPFiles.cpp
+++ b/XMPFiles/source/WXMPFiles.cpp
@@ -321,12 +321,15 @@ void WXMPFiles_GetXMP_1 ( XMPFilesRef
StartPerfCheck ( kAPIPerf_GetXMP, "" );
bool hasXMP = false;
- XMP_StringPtr packetStr;
- XMP_StringLen packetLen;
-
- if ( xmpRef == 0 ) {
+ XMP_StringPtr packetStr = NULL;
+ XMP_StringLen packetLen = 0;
+ /*Adding check to handle case where a client might not send XMPMetaRef but still want xmp packet in return. eg. CTECHXMP-4170329*/
+ if ( xmpRef == 0 && clientPacket != 0 ) {
hasXMP = thiz->GetXMP ( 0, &packetStr, &packetLen, packetInfo );
- } else {
+ } else if ( xmpRef == 0 && clientPacket == 0 ) {
+ hasXMP = thiz->GetXMP( 0, 0, 0, packetInfo );
+ }
+ else {
SXMPMeta xmpObj ( xmpRef );
hasXMP = thiz->GetXMP ( &xmpObj, &packetStr, &packetLen, packetInfo );
}
--- a/public/include/TXMPFiles.hpp
+++ b/public/include/TXMPFiles.hpp
@@ -541,7 +541,8 @@ public:
///
/// If the file is opened for update (passing \c #kXMPFiles_OpenForUpdate), the disk file remains
/// open until \c CloseFile() is called. The disk file is only updated once, when \c CloseFile()
- /// is called, regardless of how many calls are made to \c PutXMP().
+ /// is called, regardless of how many calls are made to \c PutXMP(). When in-place update is not possible
+ /// we might write into a temporary file and then swap for corruption/crash safety. /* Documenatation update for CTECHXMP-4170278*/
///
/// @param closeFlags Option flags for optional closing actions. This bit-flag constant is
/// defined:

598
202108-1.patch Normal file
View File

@ -0,0 +1,598 @@
Backport of:
From a0476060ed1acc70f532c43a6f0193de97210c5e Mon Sep 17 00:00:00 2001
From: arpitapanda05 <79362772+arpitapanda05@users.noreply.github.com>
Date: Mon, 30 Aug 2021 13:14:19 +0530
Subject: Integration For August Release (#43)
* [CTECHXMP-4170513] Fix for PSIRT-17958
* [CTECHXMP-4170540] Fix for PSIRT-18145
* [CTECHXMP-4170557] Fix for PSIRT-18538
* [CTECHXMP-4170585] Fix for PSIRT-18750
* Fix add semicolons
* Changing the CopyRight note in all the files
---
XMPCommon/BaseClasses/MemoryManagedObject.h | 6 +-
XMPCommon/BaseClasses/TSingleton.h | 6 +-
XMPCommon/ImplHeaders/ConfigurableImpl.h | 6 +-
XMPCommon/ImplHeaders/ConfigurationManagerImpl.h | 6 +-
XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h | 6 +-
XMPCommon/ImplHeaders/ErrorImpl.h | 6 +-
XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h | 6 +-
XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h | 6 +-
XMPCommon/ImplHeaders/SharedMutexImpl.h | 6 +-
XMPCommon/ImplHeaders/SharedObjectImpl.h | 6 +-
XMPCommon/ImplHeaders/ThreadSafeImpl.h | 6 +-
XMPCommon/ImplHeaders/UTF8StringImpl.h | 6 +-
.../Interfaces/BaseInterfaces/IConfigurable_I.h | 6 +-
.../Interfaces/BaseInterfaces/ISharedObject_I.h | 6 +-
.../Interfaces/BaseInterfaces/IThreadSafe_I.h | 6 +-
XMPCommon/Interfaces/IConfigurationManager_I.h | 6 +-
XMPCommon/Interfaces/IErrorNotifier_I.h | 6 +-
XMPCommon/Interfaces/IError_I.h | 6 +-
XMPCommon/Interfaces/IMemoryAllocator_I.h | 6 +-
XMPCommon/Interfaces/ISharedMutex.h | 6 +-
XMPCommon/Interfaces/IUTF8String_I.h | 6 +-
XMPCommon/Utilities/AutoSharedLock.h | 6 +-
XMPCommon/Utilities/IUTF8StringComparator.h | 6 +-
XMPCommon/Utilities/TAllocator.h | 6 +-
XMPCommon/Utilities/TAtomicTypes.h | 6 +-
XMPCommon/Utilities/TAtomicTypes_Android.h | 6 +-
XMPCommon/Utilities/TAtomicTypes_Linux.h | 6 +-
XMPCommon/Utilities/TAtomicTypes_Mac.h | 6 +-
XMPCommon/Utilities/TAtomicTypes_Win.h | 6 +-
XMPCommon/Utilities/TSmartPointers_I.h | 6 +-
XMPCommon/Utilities/UTF8String.h | 6 +-
XMPCommon/XMPCommonDefines_I.h | 6 +-
XMPCommon/XMPCommonErrorCodes_I.h | 6 +-
XMPCommon/XMPCommonFwdDeclarations_I.h | 6 +-
XMPCommon/XMPCommon_I.h | 6 +-
XMPCommon/source/AutoSharedLock.cpp | 6 +-
XMPCommon/source/ConfigurableImpl.cpp | 6 +-
XMPCommon/source/ConfigurationManagerImpl.cpp | 6 +-
XMPCommon/source/DefaultErrorNotifierImpl.cpp | 6 +-
XMPCommon/source/ErrorImpl.cpp | 6 +-
XMPCommon/source/ErrorNotifierWrapperImpl.cpp | 6 +-
XMPCommon/source/IConfigurable_I.cpp | 6 +-
XMPCommon/source/IConfigurationManager_I.cpp | 6 +-
XMPCommon/source/IErrorNotifier_I.cpp | 6 +-
XMPCommon/source/IError_I.cpp | 6 +-
XMPCommon/source/IMemoryAllocator_I.cpp | 6 +-
XMPCommon/source/IUTF8StringComparator.cpp | 6 +-
XMPCommon/source/IUTF8String_I.cpp | 6 +-
XMPCommon/source/MemoryAllocatorWrapperImpl.cpp | 6 +-
XMPCommon/source/MemoryManagedObject.cpp | 6 +-
XMPCommon/source/SharedMutexImpl.cpp | 6 +-
XMPCommon/source/SharedObjectImpl.cpp | 6 +-
XMPCommon/source/ThreadSafeImpl.cpp | 6 +-
XMPCommon/source/UTF8StringImpl.cpp | 6 +-
XMPCommon/source/XMPCommon.cpp | 6 +-
XMPCore/ImplHeaders/ArrayNodeImpl.h | 6 +-
XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h | 6 +-
.../ImplHeaders/ClientDOMSerializerWrapperImpl.h | 6 +-
XMPCore/ImplHeaders/CompositeNodeImpl.h | 6 +-
XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h | 6 +-
XMPCore/ImplHeaders/CoreObjectFactoryImpl.h | 6 +-
.../ImplHeaders/DOMImplementationRegistryImpl.h | 6 +-
XMPCore/ImplHeaders/DOMParserImpl.h | 6 +-
XMPCore/ImplHeaders/DOMSerializerImpl.h | 6 +-
XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h | 6 +-
XMPCore/ImplHeaders/MetadataImpl.h | 6 +-
XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h | 6 +-
XMPCore/ImplHeaders/NodeImpl.h | 6 +-
XMPCore/ImplHeaders/PathImpl.h | 6 +-
XMPCore/ImplHeaders/PathSegmentImpl.h | 6 +-
XMPCore/ImplHeaders/RDFDOMParserImpl.h | 6 +-
XMPCore/ImplHeaders/RDFDOMSerializerImpl.h | 6 +-
XMPCore/ImplHeaders/SimpleNodeImpl.h | 6 +-
XMPCore/ImplHeaders/StructureNodeImpl.h | 6 +-
XMPCore/ImplHeaders/TNodeIteratorImpl.h | 6 +-
XMPCore/Interfaces/IArrayNode_I.h | 6 +-
XMPCore/Interfaces/ICompositeNode_I.h | 6 +-
XMPCore/Interfaces/ICoreConfigurationManager_I.h | 6 +-
XMPCore/Interfaces/ICoreObjectFactory_I.h | 6 +-
XMPCore/Interfaces/IDOMImplementationRegistry_I.h | 6 +-
XMPCore/Interfaces/IDOMParser_I.h | 6 +-
XMPCore/Interfaces/IDOMSerializer_I.h | 6 +-
XMPCore/Interfaces/IMetadataConverterUtils_I.h | 6 +-
XMPCore/Interfaces/IMetadata_I.h | 6 +-
XMPCore/Interfaces/INameSpacePrefixMap_I.h | 6 +-
XMPCore/Interfaces/INodeIterator_I.h | 6 +-
XMPCore/Interfaces/INode_I.h | 6 +-
XMPCore/Interfaces/IPathSegment_I.h | 6 +-
XMPCore/Interfaces/IPath_I.h | 6 +-
XMPCore/Interfaces/ISimpleNode_I.h | 6 +-
XMPCore/Interfaces/IStructureNode_I.h | 6 +-
XMPCore/Interfaces/IXMPLanguageAlternative_I.h | 6 +-
XMPCore/XMPCoreDefines_I.h | 6 +-
XMPCore/XMPCoreFwdDeclarations_I.h | 6 +-
XMPCore/build/CMakeLists.txt | 2 +-
XMPCore/source/ArrayNodeImpl.cpp | 6 +-
XMPCore/source/ClientDOMParserWrapperImpl.cpp | 6 +-
XMPCore/source/ClientDOMSerializerWrapperImpl.cpp | 6 +-
XMPCore/source/CompositeNodeImpl.cpp | 6 +-
XMPCore/source/CoreConfigurationManagerImpl.cpp | 6 +-
XMPCore/source/CoreObjectFactoryImpl.cpp | 6 +-
XMPCore/source/DOMImplementationRegistryImpl.cpp | 6 +-
XMPCore/source/DOMParserImpl.cpp | 6 +-
XMPCore/source/DOMSerializerImpl.cpp | 6 +-
XMPCore/source/ExpatAdapter.cpp | 8 +-
XMPCore/source/IArrayNode_I.cpp | 6 +-
XMPCore/source/ICompositeNode_I.cpp | 6 +-
XMPCore/source/ICoreConfigurationManager_I.cpp | 6 +-
XMPCore/source/ICoreObjectFactory_I.cpp | 6 +-
XMPCore/source/IDOMImplementationRegistry_I.cpp | 6 +-
XMPCore/source/IDOMParser_I.cpp | 6 +-
XMPCore/source/IDOMSerializer_I.cpp | 6 +-
XMPCore/source/IMetadataConverterUtils_I.cpp | 6 +-
XMPCore/source/IMetadata_I.cpp | 6 +-
XMPCore/source/INameSpacePrefixMap_I.cpp | 6 +-
XMPCore/source/INodeIterator_I.cpp | 6 +-
XMPCore/source/INode_I.cpp | 6 +-
XMPCore/source/IPathSegment_I.cpp | 6 +-
XMPCore/source/IPath_I.cpp | 6 +-
XMPCore/source/ISimpleNode_I.cpp | 6 +-
XMPCore/source/IStructureNode_I.cpp | 6 +-
XMPCore/source/MetadataConverterUtilsImpl.cpp | 6 +-
XMPCore/source/MetadataImpl.cpp | 6 +-
XMPCore/source/NameSpacePrefixMapImpl.cpp | 6 +-
XMPCore/source/NodeImpl.cpp | 6 +-
XMPCore/source/ParseRDF.cpp | 6 +-
XMPCore/source/PathImpl.cpp | 6 +-
XMPCore/source/PathSegmentImpl.cpp | 6 +-
XMPCore/source/RDFDOMParserImpl.cpp | 6 +-
XMPCore/source/RDFDOMSerializerImpl.cpp | 6 +-
XMPCore/source/SimpleNodeImpl.cpp | 6 +-
XMPCore/source/StructureNodeImpl.cpp | 6 +-
XMPCore/source/WXMPIterator.cpp | 6 +-
XMPCore/source/WXMPMeta.cpp | 6 +-
XMPCore/source/WXMPUtils.cpp | 6 +-
XMPCore/source/XMPCore_Impl.cpp | 6 +-
XMPCore/source/XMPCore_Impl.hpp | 6 +-
XMPCore/source/XMPIterator.cpp | 6 +-
XMPCore/source/XMPIterator.hpp | 6 +-
XMPCore/source/XMPIterator2.cpp | 6 +-
XMPCore/source/XMPIterator2.hpp | 6 +-
XMPCore/source/XMPMeta-GetSet.cpp | 6 +-
XMPCore/source/XMPMeta-Parse.cpp | 6 +-
XMPCore/source/XMPMeta-Serialize.cpp | 4 +-
XMPCore/source/XMPMeta.cpp | 6 +-
XMPCore/source/XMPMeta.hpp | 6 +-
XMPCore/source/XMPMeta2-GetSet.cpp | 6 +-
XMPCore/source/XMPUtils-FileInfo.cpp | 6 +-
XMPCore/source/XMPUtils.cpp | 6 +-
XMPCore/source/XMPUtils.hpp | 6 +-
XMPCore/source/XMPUtils2.cpp | 6 +-
XMPFiles/build/CMakeLists.txt | 2 +-
XMPFiles/source/FileHandlers/AIFF_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/AIFF_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/ASF_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/ASF_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/AVCHD_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/AVCHD_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/Basic_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/Basic_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/FLV_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/FLV_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/GIF_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/GIF_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/InDesign_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/InDesign_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/JPEG_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/JPEG_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/MP3_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/MP3_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/MPEG2_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/MPEG2_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/MPEG4_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/MPEG4_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/P2_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/P2_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/PNG_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/PNG_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/PSD_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/PSD_Handler.hpp | 6 +-
.../source/FileHandlers/PostScript_Handler.cpp | 6 +-
.../source/FileHandlers/PostScript_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/RIFF_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/RIFF_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/SVG_Handler.cpp | 8 +-
XMPFiles/source/FileHandlers/SVG_Handler.hpp | 8 +-
XMPFiles/source/FileHandlers/SWF_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/SWF_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/Scanner_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/Scanner_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/TIFF_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/TIFF_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/Trivial_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/Trivial_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/UCF_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/UCF_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/WAVE_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/WAVE_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp | 6 +-
XMPFiles/source/FileHandlers/XDCAM_Handler.cpp | 6 +-
XMPFiles/source/FileHandlers/XDCAM_Handler.hpp | 6 +-
.../source/FormatSupport/AIFF/AIFFBehavior.cpp | 6 +-
XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h | 6 +-
.../source/FormatSupport/AIFF/AIFFMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h | 6 +-
.../source/FormatSupport/AIFF/AIFFReconcile.cpp | 6 +-
XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h | 6 +-
XMPFiles/source/FormatSupport/ASF_Support.cpp | 11 +-
XMPFiles/source/FormatSupport/ASF_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/ID3_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/ID3_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/IFF/Chunk.cpp | 6 +-
XMPFiles/source/FormatSupport/IFF/Chunk.h | 6 +-
.../source/FormatSupport/IFF/ChunkController.cpp | 6 +-
.../source/FormatSupport/IFF/ChunkController.h | 6 +-
XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp | 6 +-
XMPFiles/source/FormatSupport/IFF/ChunkPath.h | 6 +-
.../source/FormatSupport/IFF/IChunkBehavior.cpp | 6 +-
XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h | 6 +-
.../source/FormatSupport/IFF/IChunkContainer.h | 6 +-
XMPFiles/source/FormatSupport/IFF/IChunkData.h | 6 +-
XMPFiles/source/FormatSupport/IPTC_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/IPTC_Support.hpp | 6 +-
.../source/FormatSupport/ISOBaseMedia_Support.cpp | 6 +-
.../source/FormatSupport/ISOBaseMedia_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/META_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/META_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/MOOV_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/MOOV_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/P2_Support.cpp | 8 +-
XMPFiles/source/FormatSupport/P2_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/PNG_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/PNG_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp | 6 +-
.../source/FormatSupport/PSIR_MemoryReader.cpp | 6 +-
XMPFiles/source/FormatSupport/PSIR_Support.hpp | 6 +-
.../source/FormatSupport/PackageFormat_Support.cpp | 6 +-
.../source/FormatSupport/PackageFormat_Support.hpp | 6 +-
.../source/FormatSupport/PostScript_Support.cpp | 6 +-
.../source/FormatSupport/PostScript_Support.hpp | 8 +-
.../source/FormatSupport/QuickTime_Support.cpp | 6 +-
.../source/FormatSupport/QuickTime_Support.hpp | 14 +-
XMPFiles/source/FormatSupport/RIFF.cpp | 6 +-
XMPFiles/source/FormatSupport/RIFF.hpp | 6 +-
XMPFiles/source/FormatSupport/RIFF_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/RIFF_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/ReconcileIPTC.cpp | 6 +-
XMPFiles/source/FormatSupport/ReconcileLegacy.cpp | 6 +-
XMPFiles/source/FormatSupport/ReconcileLegacy.hpp | 6 +-
XMPFiles/source/FormatSupport/ReconcileTIFF.cpp | 6 +-
XMPFiles/source/FormatSupport/Reconcile_Impl.cpp | 6 +-
XMPFiles/source/FormatSupport/Reconcile_Impl.hpp | 6 +-
XMPFiles/source/FormatSupport/SVG_Adapter.cpp | 21 ++-
XMPFiles/source/FormatSupport/SVG_Adapter.hpp | 8 +-
XMPFiles/source/FormatSupport/SWF_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/SWF_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp | 6 +-
.../source/FormatSupport/TIFF_MemoryReader.cpp | 6 +-
XMPFiles/source/FormatSupport/TIFF_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/TIFF_Support.hpp | 6 +-
.../source/FormatSupport/TimeConversionUtils.cpp | 6 +-
.../source/FormatSupport/TimeConversionUtils.hpp | 6 +-
.../source/FormatSupport/WAVE/BEXTMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h | 6 +-
.../source/FormatSupport/WAVE/CartMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/CartMetadata.h | 6 +-
.../source/FormatSupport/WAVE/Cr8rMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h | 6 +-
.../source/FormatSupport/WAVE/DISPMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h | 6 +-
.../source/FormatSupport/WAVE/INFOMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h | 6 +-
.../source/FormatSupport/WAVE/PrmLMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h | 6 +-
.../source/FormatSupport/WAVE/WAVEBehavior.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h | 6 +-
.../source/FormatSupport/WAVE/WAVEReconcile.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h | 6 +-
.../source/FormatSupport/WAVE/iXMLMetadata.cpp | 6 +-
XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h | 6 +-
XMPFiles/source/FormatSupport/XDCAM_Support.cpp | 6 +-
XMPFiles/source/FormatSupport/XDCAM_Support.hpp | 6 +-
XMPFiles/source/FormatSupport/XMPScanner.cpp | 6 +-
XMPFiles/source/FormatSupport/XMPScanner.hpp | 6 +-
XMPFiles/source/HandlerRegistry.cpp | 6 +-
XMPFiles/source/HandlerRegistry.h | 6 +-
.../source/NativeMetadataSupport/IMetadata.cpp | 6 +-
XMPFiles/source/NativeMetadataSupport/IMetadata.h | 6 +-
.../source/NativeMetadataSupport/IReconcile.cpp | 6 +-
XMPFiles/source/NativeMetadataSupport/IReconcile.h | 6 +-
.../source/NativeMetadataSupport/MetadataSet.cpp | 6 +-
.../source/NativeMetadataSupport/MetadataSet.h | 6 +-
.../source/NativeMetadataSupport/ValueObject.h | 6 +-
XMPFiles/source/PluginHandler/FileHandler.h | 6 +-
.../source/PluginHandler/FileHandlerInstance.cpp | 6 +-
.../source/PluginHandler/FileHandlerInstance.h | 6 +-
XMPFiles/source/PluginHandler/HostAPIImpl.cpp | 6 +-
XMPFiles/source/PluginHandler/Module.cpp | 6 +-
XMPFiles/source/PluginHandler/Module.h | 6 +-
XMPFiles/source/PluginHandler/ModuleUtils.h | 6 +-
XMPFiles/source/PluginHandler/OS_Utils_Android.cpp | 6 +-
XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp | 6 +-
XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp | 6 +-
XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp | 6 +-
XMPFiles/source/PluginHandler/PluginManager.cpp | 6 +-
XMPFiles/source/PluginHandler/PluginManager.h | 6 +-
XMPFiles/source/PluginHandler/XMPAtoms.cpp | 6 +-
XMPFiles/source/PluginHandler/XMPAtoms.h | 6 +-
XMPFiles/source/WXMPFiles.cpp | 6 +-
XMPFiles/source/XMPFiles.cpp | 6 +-
XMPFiles/source/XMPFiles.hpp | 6 +-
XMPFiles/source/XMPFiles_Impl.cpp | 6 +-
XMPFiles/source/XMPFiles_Impl.hpp | 6 +-
.../PDF_Handler/resource/win/CopyPDFL.bat | 28 +--
.../PluginTemplate/build/CMakeLists.txt | 2 +-
.../build/GeneratePluginTemplate_mac.sh | 2 +-
.../build/GeneratePluginTemplate_win.bat | 2 +-
XMPFilesPlugins/PluginTemplate/build/README.txt | 40 ++---
.../PluginTemplate/source/Template_Handler.cpp | 6 +-
XMPFilesPlugins/api/source/HostAPI.h | 6 +-
XMPFilesPlugins/api/source/HostAPIAccess.cpp | 6 +-
XMPFilesPlugins/api/source/HostAPIAccess.h | 6 +-
XMPFilesPlugins/api/source/PluginAPIImpl.cpp | 6 +-
XMPFilesPlugins/api/source/PluginBase.cpp | 6 +-
XMPFilesPlugins/api/source/PluginBase.h | 6 +-
XMPFilesPlugins/api/source/PluginConst.h | 6 +-
XMPFilesPlugins/api/source/PluginHandler.h | 6 +-
XMPFilesPlugins/api/source/PluginRegistry.cpp | 6 +-
XMPFilesPlugins/api/source/PluginRegistry.h | 6 +-
XMPFilesPlugins/api/source/PluginUtils.cpp | 6 +-
XMPFilesPlugins/api/source/PluginUtils.h | 6 +-
build/CMakeLists.txt | 2 +-
build/GenerateAndBuildXMPToolkitSDK_android.sh | 2 +-
build/GenerateXMPToolkitSDK_mac.sh | 2 +-
build/GenerateXMPToolkitSDK_win.bat | 2 +-
build/ProductConfig.cmake | 4 +-
build/README.txt | 110 ++++++------
build/XMP_BuildInfo.h | 6 +-
build/XMP_Config.cmake | 2 +-
build/XMP_ConfigCommon.cmake | 2 +-
build/cmake.bat | 2 +-
build/cmake_all.bat | 2 +-
build/shared/CMakeUtils.bat | 2 +-
build/shared/CMakeUtils.sh | 2 +-
build/shared/SharedConfig.cmake | 2 +-
build/shared/SharedConfig_Android.cmake | 4 +-
build/shared/SharedConfig_Common.cmake | 2 +-
build/shared/SharedConfig_Ios.cmake | 2 +-
build/shared/SharedConfig_Linux.cmake | 2 +-
build/shared/SharedConfig_Mac.cmake | 2 +-
build/shared/SharedConfig_Win.cmake | 2 +-
build/shared/ToolchainGCC.cmake | 2 +-
build/shared/ToolchainLLVM.cmake | 2 +-
build/shared/Toolchain_ios.cmake | 2 +-
public/include/TXMPFiles.hpp | 6 +-
public/include/TXMPIterator.hpp | 6 +-
public/include/TXMPMeta.hpp | 6 +-
public/include/TXMPUtils.hpp | 6 +-
public/include/XMP.hpp | 6 +-
.../Interfaces/BaseInterfaces/IConfigurable.h | 6 +-
.../Interfaces/BaseInterfaces/ISharedObject.h | 6 +-
.../Interfaces/BaseInterfaces/IThreadSafe.h | 6 +-
.../Interfaces/BaseInterfaces/IVersionable.h | 6 +-
.../XMPCommon/Interfaces/IConfigurationManager.h | 6 +-
public/include/XMPCommon/Interfaces/IError.h | 6 +-
.../include/XMPCommon/Interfaces/IErrorNotifier.h | 6 +-
.../XMPCommon/Interfaces/IMemoryAllocator.h | 6 +-
.../include/XMPCommon/Interfaces/IObjectFactory.h | 6 +-
public/include/XMPCommon/Interfaces/IUTF8String.h | 6 +-
.../XMPCommon/Utilities/TWrapperFunctions.h | 6 +-
.../XMPCommon/Utilities/TWrapperFunctions2.h | 6 +-
public/include/XMPCommon/XMPCommonDefines.h | 6 +-
public/include/XMPCommon/XMPCommonErrorCodes.h | 6 +-
.../include/XMPCommon/XMPCommonFwdDeclarations.h | 6 +-
.../XMPCommon/XMPCommonLatestInterfaceVersions.h | 6 +-
public/include/XMPCommon/source/IConfigurable.cpp | 6 +-
.../XMPCommon/source/IConfigurationManager.cpp | 6 +-
public/include/XMPCommon/source/IError.cpp | 6 +-
public/include/XMPCommon/source/IErrorNotifier.cpp | 6 +-
public/include/XMPCommon/source/IUTF8String.cpp | 6 +-
public/include/XMPCore/Interfaces/IArrayNode.h | 6 +-
.../include/XMPCore/Interfaces/IClientDOMParser.h | 6 +-
.../XMPCore/Interfaces/IClientDOMSerializer.h | 6 +-
public/include/XMPCore/Interfaces/ICompositeNode.h | 6 +-
.../XMPCore/Interfaces/ICoreConfigurationManager.h | 6 +-
.../XMPCore/Interfaces/ICoreObjectFactory.h | 6 +-
.../Interfaces/IDOMImplementationRegistry.h | 6 +-
public/include/XMPCore/Interfaces/IDOMParser.h | 6 +-
public/include/XMPCore/Interfaces/IDOMSerializer.h | 6 +-
public/include/XMPCore/Interfaces/IMetadata.h | 6 +-
.../XMPCore/Interfaces/IMetadataConverterUtils.h | 6 +-
.../XMPCore/Interfaces/INameSpacePrefixMap.h | 6 +-
public/include/XMPCore/Interfaces/INode.h | 6 +-
public/include/XMPCore/Interfaces/INodeIterator.h | 6 +-
public/include/XMPCore/Interfaces/IPath.h | 6 +-
public/include/XMPCore/Interfaces/IPathSegment.h | 6 +-
public/include/XMPCore/Interfaces/ISimpleNode.h | 6 +-
public/include/XMPCore/Interfaces/IStructureNode.h | 6 +-
public/include/XMPCore/XMPCoreDefines.h | 6 +-
public/include/XMPCore/XMPCoreErrorCodes.h | 6 +-
public/include/XMPCore/XMPCoreFwdDeclarations.h | 6 +-
.../XMPCore/XMPCoreLatestInterfaceVersions.h | 6 +-
public/include/XMPCore/source/IArrayNode.cpp | 6 +-
public/include/XMPCore/source/IClientDOMParser.cpp | 6 +-
.../XMPCore/source/IClientDOMSerializer.cpp | 6 +-
public/include/XMPCore/source/ICompositeNode.cpp | 6 +-
.../XMPCore/source/ICoreConfigurationManager.cpp | 6 +-
.../include/XMPCore/source/ICoreObjectFactory.cpp | 6 +-
.../XMPCore/source/IDOMImplementationRegistry.cpp | 6 +-
public/include/XMPCore/source/IDOMParser.cpp | 6 +-
public/include/XMPCore/source/IDOMSerializer.cpp | 6 +-
public/include/XMPCore/source/IMetadata.cpp | 6 +-
.../XMPCore/source/IMetadataConverterUtils.cpp | 6 +-
.../include/XMPCore/source/INameSpacePrefixMap.cpp | 6 +-
public/include/XMPCore/source/INode.cpp | 6 +-
public/include/XMPCore/source/INodeIterator.cpp | 6 +-
public/include/XMPCore/source/IPath.cpp | 6 +-
public/include/XMPCore/source/IPathSegment.cpp | 6 +-
public/include/XMPCore/source/ISimpleNode.cpp | 6 +-
public/include/XMPCore/source/IStructureNode.cpp | 6 +-
public/include/XMP_Const.h | 6 +-
public/include/XMP_Environment.h | 6 +-
public/include/XMP_IO.hpp | 6 +-
public/include/XMP_Version.h | 6 +-
public/include/client-glue/WXMPFiles.hpp | 6 +-
public/include/client-glue/WXMPIterator.hpp | 6 +-
public/include/client-glue/WXMPMeta.hpp | 6 +-
public/include/client-glue/WXMPUtils.hpp | 6 +-
public/include/client-glue/WXMP_Common.hpp | 6 +-
samples/build/GenerateSamples_mac.sh | 2 +-
samples/build/GenerateSamples_win.bat | 2 +-
samples/build/cmake/CMakeLists.txt | 58 +++----
samples/build/cmake/CMakeListsCommonSDK.txt | 154 ++++++++---------
samples/build/cmake/CustomSchema/CMakeLists.txt | 174 +++++++++----------
.../build/cmake/CustomSchemaNewDOM/CMakeLists.txt | 188 ++++++++++----------
samples/build/cmake/DumpFile/CMakeLists.txt | 2 +-
samples/build/cmake/DumpFile/CMakeListsCommon.txt | 150 ++++++++--------
samples/build/cmake/DumpMainXMP/CMakeLists.txt | 170 +++++++++---------
samples/build/cmake/DumpScannedXMP/CMakeLists.txt | 174 +++++++++----------
samples/build/cmake/ModifyingXMP/CMakeLists.txt | 176 +++++++++----------
.../build/cmake/ModifyingXMPNewDOM/CMakeLists.txt | 188 ++++++++++----------
samples/build/cmake/ReadingXMP/CMakeLists.txt | 176 +++++++++----------
.../build/cmake/ReadingXMPNewDOM/CMakeLists.txt | 190 ++++++++++-----------
samples/build/cmake/SharedConfigSDK.cmake | 2 +-
samples/build/cmake/XMPCommand/CMakeLists.txt | 2 +-
.../build/cmake/XMPCommand/CMakeListsCommon.txt | 160 ++++++++---------
samples/build/cmake/XMPCoreCoverage/CMakeLists.txt | 170 +++++++++---------
.../build/cmake/XMPFilesCoverage/CMakeLists.txt | 170 +++++++++---------
samples/build/cmake/XMPIterations/CMakeLists.txt | 172 +++++++++----------
samples/build/readme.txt | 40 ++---
samples/source/CustomSchema.cpp | 6 +-
samples/source/CustomSchemaNewDOM.cpp | 6 +-
samples/source/DumpMainXMP.cpp | 6 +-
samples/source/DumpScannedXMP.cpp | 6 +-
samples/source/ModifyingXMP.cpp | 6 +-
samples/source/ModifyingXMPNewDOM.cpp | 6 +-
samples/source/ReadingXMP.cpp | 6 +-
samples/source/ReadingXMPNewDOM.cpp | 6 +-
samples/source/XMPCoreCoverage.cpp | 6 +-
samples/source/XMPFilesCoverage.cpp | 6 +-
samples/source/XMPIterations.cpp | 6 +-
samples/source/common/DumpFile.cpp | 2 +-
samples/source/common/LargeFileAccess.cpp | 2 +-
samples/source/common/LargeFileAccess.hpp | 2 +-
samples/source/common/Log.cpp | 2 +-
samples/source/common/Log.h | 2 +-
samples/source/common/TagTree.cpp | 2 +-
samples/source/common/TagTree.h | 2 +-
samples/source/common/XMPScanner.cpp | 2 +-
samples/source/common/XMPScanner.hpp | 2 +-
samples/source/common/globals.h | 2 +-
samples/source/dumpfile/main.cpp | 10 +-
samples/source/xmpcommand/Actions.cpp | 6 +-
samples/source/xmpcommand/Actions.h | 6 +-
samples/source/xmpcommand/PrintUsage.cpp | 10 +-
samples/source/xmpcommand/PrintUsage.h | 6 +-
samples/source/xmpcommand/XMPCommand.cpp | 6 +-
source/Endian.h | 6 +-
source/EndianUtils.hpp | 6 +-
source/ExpatAdapter.hpp | 6 +-
source/Host_IO-POSIX.cpp | 6 +-
source/Host_IO-Win.cpp | 6 +-
source/Host_IO.hpp | 6 +-
source/IOUtils.cpp | 6 +-
source/IOUtils.hpp | 6 +-
source/PerfUtils.cpp | 6 +-
source/PerfUtils.hpp | 6 +-
source/SafeStringAPIs.cpp | 4 +-
source/SafeStringAPIs.h | 4 +-
source/SafeTypes.h | 4 +-
source/SuppressSAL.h | 4 +-
source/UnicodeConversions.cpp | 6 +-
source/UnicodeConversions.hpp | 6 +-
source/XIO.cpp | 6 +-
source/XIO.hpp | 6 +-
source/XMLParserAdapter.hpp | 6 +-
source/XML_Node.cpp | 6 +-
source/XMPFiles_IO.cpp | 6 +-
source/XMPFiles_IO.hpp | 6 +-
source/XMP_LibUtils.cpp | 6 +-
source/XMP_LibUtils.hpp | 6 +-
source/XMP_ProgressTracker.cpp | 6 +-
source/XMP_ProgressTracker.hpp | 6 +-
third-party/expat/ReadMe.txt | 152 ++++++++---------
third-party/zlib/ReadMe.txt | 50 ++++--
tools/android/ReadMe.txt | 36 ++--
tools/cmake/ReadMe.txt | 30 ++--
514 files changed, 2458 insertions(+), 3322 deletions(-)
--- a/XMPFiles/source/FileHandlers/SVG_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/SVG_Handler.cpp
@@ -66,6 +66,8 @@ bool SVG_CheckFormat( XMP_FileFormat for
if ( svgChecker == 0 )
return false;
+ svgChecker->SetErrorCallback(&parent->errorCallback);
+
bool isSVG = false;
fileRef->Rewind();
--- a/XMPFiles/source/FormatSupport/ASF_Support.cpp
+++ b/XMPFiles/source/FormatSupport/ASF_Support.cpp
@@ -157,6 +157,11 @@ bool ASF_Support::ReadHeaderObject ( XMP
fileRef->Seek ( pos, kXMP_SeekFromStart );
objectBase.size = GetUns64LE ( &objectBase.size );
+ if (XMP_Uns32(objectBase.size) <= 0) /* as ASF_ObjectBase has size in XMP_Uns64 , XMP_Uns32 would give 0 for very large files exceeding UINT32_MAX */
+ {
+ XMP_Throw("Failure reading ASF header object", kXMPErr_InternalFailure);
+ }
+
if ( IsEqualGUID ( ASF_File_Properties_Object, objectBase.guid) && (objectBase.size >= 104 ) ) {
buffer.clear();
--- a/XMPFiles/source/FormatSupport/P2_Support.cpp
+++ b/XMPFiles/source/FormatSupport/P2_Support.cpp
@@ -139,7 +139,7 @@ void P2_Clip::CacheClipContent()
p2Offset= p2node->GetNamedElement ( p2NameSpace, "GlobalShotID" );
GetElementLocation(p2Offset,headContent.shotId );
XML_NodePtr p2connection= p2node->GetNamedElement ( p2NameSpace, "Connection" );
- if ( p2node != 0 )
+ if ( p2connection != 0 )
{
p2node= p2connection->GetNamedElement ( p2NameSpace, "Top" );
if ( p2node != 0 )
--- a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp
+++ b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp
@@ -211,7 +211,14 @@ XMP_Bool SVG_Adapter::ParseBufferNoThrow
length = 1;
}
- status = XML_Parse( this->parser, ( const char * ) buffer, static_cast< XMP_StringLen >( length ), last );
+ try
+ {
+ status = XML_Parse(this->parser, (const char *)buffer, static_cast<XMP_StringLen>(length), last);
+ }
+ catch (XMP_Error &e)
+ {
+ return false; //Don't let one failure abort checking other file formats , this api is called only from checkFileFormat
+ }
#if BanAllEntityUsage
if ( this->isAborted ) {
@@ -233,6 +240,8 @@ static void ParseFullNS( XMP_StringPtr f
{
// Expat delivers the full name as a catenation of namespace URI, separator, and local name.
size_t sepPos = strlen( fullName );
+ if (!sepPos)
+ return; //Throw?
for ( --sepPos; sepPos > 0; --sepPos ) {
if ( fullName[ sepPos ] == FullNameSeparator ) break;
}

90
202108-2.patch Normal file
View File

@ -0,0 +1,90 @@
Backport of:
From 16e53564ae6c2689387479c04770f492075d5b7b Mon Sep 17 00:00:00 2001
From: Gabriele Mondada <gmondada@recolive.com>
Date: Mon, 30 Aug 2021 10:11:18 +0200
Subject: fix not fully implemented kXMPFiles_OpenOnlyXMP flag (#24)
---
XMPFiles/source/FileHandlers/MPEG4_Handler.cpp | 66 +++++++++++++-------------
1 file changed, 34 insertions(+), 32 deletions(-)
--- a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
@@ -2191,44 +2191,43 @@ void MPEG4_MetaHandler::ProcessXMP()
// Import the non-XMP items. Do the imports in reverse priority order, last import wins!
- MOOV_Manager::BoxInfo mvhdInfo;
- MOOV_Manager::BoxRef mvhdRef = this->moovMgr.GetBox ( "moov/mvhd", &mvhdInfo );
- bool mvhdFound = ((mvhdRef != 0) && (mvhdInfo.contentSize != 0));
-
- MOOV_Manager::BoxInfo udtaInfo;
- MOOV_Manager::BoxRef udtaRef = this->moovMgr.GetBox ( "moov/udta", &udtaInfo );
- std::vector<MOOV_Manager::BoxInfo> cprtBoxes;
-
- if ( udtaRef != 0 ) {
- for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) {
- MOOV_Manager::BoxInfo currInfo;
- MOOV_Manager::BoxRef currRef = this->moovMgr.GetNthChild ( udtaRef, i, &currInfo );
- if ( currRef == 0 ) break; // Sanity check, should not happen.
- if ( currInfo.boxType != ISOMedia::k_cprt ) continue;
- cprtBoxes.push_back ( currInfo );
+ if ( !xmpOnly ) {
+ MOOV_Manager::BoxInfo mvhdInfo;
+ MOOV_Manager::BoxRef mvhdRef = this->moovMgr.GetBox ( "moov/mvhd", &mvhdInfo );
+ bool mvhdFound = ((mvhdRef != 0) && (mvhdInfo.contentSize != 0));
+
+ MOOV_Manager::BoxInfo udtaInfo;
+ MOOV_Manager::BoxRef udtaRef = this->moovMgr.GetBox ( "moov/udta", &udtaInfo );
+ std::vector<MOOV_Manager::BoxInfo> cprtBoxes;
+ if ( udtaRef != 0 ) {
+ for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) {
+ MOOV_Manager::BoxInfo currInfo;
+ MOOV_Manager::BoxRef currRef = this->moovMgr.GetNthChild ( udtaRef, i, &currInfo );
+ if ( currRef == 0 ) break; // Sanity check, should not happen.
+ if ( currInfo.boxType != ISOMedia::k_cprt ) continue;
+ cprtBoxes.push_back ( currInfo );
+ }
}
- }
- bool cprtFound = (! cprtBoxes.empty());
+ bool cprtFound = (! cprtBoxes.empty());
- bool tradQTFound = this->tradQTMgr.ParseCachedBoxes ( this->moovMgr );
- bool tmcdFound = this->ParseTimecodeTrack();
+ bool tradQTFound = this->tradQTMgr.ParseCachedBoxes ( this->moovMgr );
- if ( this->fileMode == MOOV_Manager::kFileIsNormalISO ) {
+ bool tmcdFound = this->ParseTimecodeTrack();
- if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj );
- if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj );
- if ( tmcdFound ) this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj );
- } else { // This is a QuickTime file, either traditional or modern.
-
- if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj );
- if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj );
- if ( tmcdFound | tradQTFound ) {
- // Some of the timecode items are in the .../udta/©... set but handled by ImportTimecodeItems.
- this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj );
+ if ( this->fileMode == MOOV_Manager::kFileIsNormalISO ) {
+ if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj );
+ if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj );
+ if ( tmcdFound ) this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj );
+ } else { // This is a QuickTime file, either traditional or modern.
+
+ if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj );
+ if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj );
+ if ( tmcdFound | tradQTFound ) {
+ // Some of the timecode items are in the .../udta/... set but handled by ImportTimecodeItems.
+ this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj );
+ }
+ this->containsXMP |= ImportCr8rItems ( this->moovMgr, &this->xmpObj );
}
-
- this->containsXMP |= ImportCr8rItems ( this->moovMgr, &this->xmpObj );
-
}
} // MPEG4_MetaHandler::ProcessXMP

14
exempi.spec
View File

@ -1,11 +1,15 @@
Name: exempi
Version: 2.5.2
Release: 3
Release: 4
Summary: Exempi is an implementation of XMP (Adobe's Extensible Metadata Platform)
License: BSD
URL: https://wiki.freedesktop.org/libopenraw/Exempi/
Source0: http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2
Patch6000: 202107.patch
Patch6001: 202108-1.patch
Patch6002: 202108-2.patch
BuildRequires: gcc-c++ autoconf automake libtool
BuildRequires: boost-devel expat-devel zlib-devel pkgconfig
Provides: bundled(md5-polstra)
@ -62,6 +66,14 @@ make check
%{_mandir}/man1/exempi.1*
%changelog
* Thu Sep 21 2023 dillon chen <dillon.chen@gmail.com> - 2.5.2-4
- CVE-2021-36045, CVE-2021-36046, CVE-2021-36047, CVE-2021-36048,
- CVE-2021-36050, CVE-2021-36051, CVE-2021-36052, CVE-2021-36053,
- CVE-2021-36054, CVE-2021-36055, CVE-2021-36056, CVE-2021-36058,
- CVE-2021-36064, CVE-2021-39847, CVE-2021-40716, CVE-2021-40732,
- CVE-2021-42528, CVE-2021-42529, CVE-2021-42530, CVE-2021-42531,
- CVE-2021-42532
* Mon Apr 18 2022 Wei, Qiang <qiang.wei@suse.com> - 2.5.2-3
- Remove self dependency which is temporary used to resolve compatiable during upgrade.