Skip to content

use larger data size, check size before calling other routines #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisCoxArt merged 1 commit into from
Jun 11, 2026
Merged

use larger data size, check size before calling other routines #1298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions IccProfLib/IccTagBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
#include <cstdlib>
#include <algorithm>
#include <new>
#include <climits>
#include "IccTag.h"
#include "IccUtil.h"
#include "IccProfile.h"
Expand Down Expand Up @@ -5354,7 +5355,7 @@ icValidateStatus CIccTagSparseMatrixArray::Validate(std::string sigPath, std::st
if (!m_RawData) {
sReport += icMsgValidateCriticalError;
sReport += sSigPathName;
sReport += " - Data dont defined for matrices\n";
sReport += " - Data not defined for matrices\n";
rv = icMaxStatus(rv, icValidateCriticalError);
return rv;
}
Expand All @@ -5363,10 +5364,18 @@ icValidateStatus CIccTagSparseMatrixArray::Validate(std::string sigPath, std::st
CIccSparseMatrix mtx;
int i;

icUInt16Number nBytesPerMatrix = m_nChannelsPerMatrix * sizeof(icFloatNumber);
size_t nBytesPerMatrix = m_nChannelsPerMatrix * sizeof(icFloatNumber);
const size_t bufSize = 128;
char buf[bufSize];

if ( nBytesPerMatrix > 0xFFFFFFFFULL ) { // make sure it is less than 32 bit max
sReport += icMsgValidateCriticalError;
sReport += sSigPathName;
sReport += " - Matrix data size too large\n";
rv = icMaxStatus(rv, icValidateCriticalError);
return rv;
}

if (!mtx.Reset(m_RawData, nBytesPerMatrix, icSparseMatrixFloatNum, true)) {
sReport += icMsgValidateCriticalError;
sReport += sSigPathName;
Expand All @@ -5378,7 +5387,7 @@ icValidateStatus CIccTagSparseMatrixArray::Validate(std::string sigPath, std::st

nRows = mtx.Rows();
nCols = mtx.Cols();
icUInt32Number nMaxElements = CIccSparseMatrix::MaxEntries(nBytesPerMatrix, nRows, sizeof(icFloatNumber));
icUInt32Number nMaxElements = CIccSparseMatrix::MaxEntries( (icUInt32Number)nBytesPerMatrix, nRows, sizeof(icFloatNumber));
icUInt8Number *temp = new icUInt8Number[nBytesPerMatrix];

for (i=0; i<(int)m_nSize; i++) {
Expand Down
Loading