Skip to content

Improve LUT loading checks #2307

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

Open
doug-walker wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −13
Open

Improve LUT loading checks #2307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa842db
Fix observed behavior
doug-walker Apr 18, 2026
7a4e114
Merge branch 'main' into walker/lut-load
doug-walker May 5, 2026
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
4 changes: 2 additions & 2 deletions src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ int Lut1dUtils::IMLutGet(
{
char dstDepthS[16] = "";
#ifdef _WIN32
const int nummatched = sscanf(InString, "%*s %d %d %s", &numtables, &length, dstDepthS, 16);
const int nummatched = sscanf_s(InString, "%*s %d %d %15s", &numtables, &length, dstDepthS, 16);
#else
const int nummatched = sscanf(InString, "%*s %d %d %s", &numtables, &length, dstDepthS);
const int nummatched = sscanf(InString, "%*s %d %d %15s", &numtables, &length, dstDepthS);
#endif
std::string subStr(InString, 5);
if (nummatched < 2 ||
Expand Down
8 changes: 4 additions & 4 deletions src/OpenColorIO/fileformats/FileFormatIridasCube.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ LocalFileFormat::read(std::istream & istream,
char domainMinB[64] = "";

#ifdef _WIN32
if (sscanf_s(line.c_str(), "domain_min %s %s %s %c", domainMinR, 64, domainMinG, 64, domainMinB, 64, &endTok, 1) != 3)
if (sscanf_s(line.c_str(), "domain_min %63s %63s %63s %c", domainMinR, 64, domainMinG, 64, domainMinB, 64, &endTok, 1) != 3)
#else
if (sscanf(line.c_str(), "domain_min %s %s %s %c", domainMinR, domainMinG, domainMinB, &endTok) != 3)
if (sscanf(line.c_str(), "domain_min %63s %63s %63s %c", domainMinR, domainMinG, domainMinB, &endTok) != 3)
#endif
{
ThrowErrorMessage(
Expand Down Expand Up @@ -275,9 +275,9 @@ LocalFileFormat::read(std::istream & istream,
char domainMaxB[64] = "";

#ifdef _WIN32
if (sscanf_s(line.c_str(), "domain_max %s %s %s %c", domainMaxR, 64, domainMaxG, 64, domainMaxB, 64, &endTok, 1) != 3)
if (sscanf_s(line.c_str(), "domain_max %63s %63s %63s %c", domainMaxR, 64, domainMaxG, 64, domainMaxB, 64, &endTok, 1) != 3)
#else
if (sscanf(line.c_str(), "domain_max %s %s %s %c", domainMaxR, domainMaxG, domainMaxB, &endTok) != 3)
if (sscanf(line.c_str(), "domain_max %63s %63s %63s %c", domainMaxR, domainMaxG, domainMaxB, &endTok) != 3)
#endif
{
ThrowErrorMessage(
Expand Down
8 changes: 4 additions & 4 deletions src/OpenColorIO/fileformats/FileFormatSpi1D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
char fromMinS[64] = "";
char fromMaxS[64] = "";
#ifdef _WIN32
if (sscanf_s(lineBuffer, "From %s %s", fromMinS, 64, fromMaxS, 64) != 2)
if (sscanf_s(lineBuffer, "From %63s %63s", fromMinS, 64, fromMaxS, 64) != 2)
#else
if (sscanf(lineBuffer, "From %s %s", fromMinS, fromMaxS) != 2)
if (sscanf(lineBuffer, "From %63s %63s", fromMinS, fromMaxS) != 2)
#endif
{
ThrowErrorMessage("Invalid 'From' Tag", currentLine, headerLine);
Expand Down Expand Up @@ -219,11 +219,11 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,

char inputLUT[4][64] = {"", "", "", ""};
#ifdef _WIN32
if (sscanf_s(lineBuffer, "%s %s %s %63s", inputLUT[0], 64,
if (sscanf_s(lineBuffer, "%63s %63s %63s %63s", inputLUT[0], 64,
inputLUT[1], 64, inputLUT[2], 64, inputLUT[3],
64) != components)
#else
if (sscanf(lineBuffer, "%s %s %s %63s", inputLUT[0],
if (sscanf(lineBuffer, "%63s %63s %63s %63s", inputLUT[0],
inputLUT[1], inputLUT[2], inputLUT[3]) != components)
#endif
{
Expand Down
5 changes: 2 additions & 3 deletions src/OpenColorIO/fileformats/FileFormatSpi3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,13 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
char blueValueS[64] = "";

#ifdef _WIN32
if (sscanf(lineBuffer,
"%d %d %d %s %s %s",
if (sscanf_s(lineBuffer, "%d %d %d %63s %63s %63s",
&rIndex, &gIndex, &bIndex,
redValueS, 64,
greenValueS, 64,
blueValueS, 64) == 6)
#else
if (sscanf(lineBuffer, "%d %d %d %s %s %s",
if (sscanf(lineBuffer, "%d %d %d %63s %63s %63s",
&rIndex, &gIndex, &bIndex,
redValueS, greenValueS, blueValueS) == 6)
#endif
Expand Down