Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xmpsdk/src/XMPMeta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static const char * kTenSpaces = " ";
#define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%X", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \
status = (*outProc) ( refCon, buffer, strlen(buffer) ); if ( status != 0 ) goto EXIT; }
#else
#define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%lX", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \
#define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%X", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \
status = (*outProc) ( refCon, buffer, strlen(buffer) ); if ( status != 0 ) goto EXIT; }
#endif

Expand Down
4 changes: 2 additions & 2 deletions xmpsdk/src/XMPUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1218,9 +1218,9 @@ XMPUtils::ConvertToInt64 ( XMP_StringPtr strValue )
XMP_Int64 result;

if ( ! XMP_LitNMatch ( strValue, "0x", 2 ) ) {
count = sscanf ( strValue, "%lld%c", &result, &nextCh );
count = sscanf ( strValue, "%ld%c", &result, &nextCh );
} else {
count = sscanf ( strValue, "%llx%c", &result, &nextCh );
count = sscanf ( strValue, "%lx%c", &result, &nextCh );
}

if ( count != 1 ) XMP_Throw ( "Invalid integer string", kXMPErr_BadParam );
Expand Down