Skip to content

Commit 222ca50

Browse files
authored
Fix observed behavior (#2307)
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
1 parent 4a119df commit 222ca50

4 files changed

Lines changed: 12 additions & 13 deletions

File tree

src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ int Lut1dUtils::IMLutGet(
411411
{
412412
char dstDepthS[16] = "";
413413
#ifdef _WIN32
414-
const int nummatched = sscanf(InString, "%*s %d %d %s", &numtables, &length, dstDepthS, 16);
414+
const int nummatched = sscanf_s(InString, "%*s %d %d %15s", &numtables, &length, dstDepthS, 16);
415415
#else
416-
const int nummatched = sscanf(InString, "%*s %d %d %s", &numtables, &length, dstDepthS);
416+
const int nummatched = sscanf(InString, "%*s %d %d %15s", &numtables, &length, dstDepthS);
417417
#endif
418418
std::string subStr(InString, 5);
419419
if (nummatched < 2 ||

src/OpenColorIO/fileformats/FileFormatIridasCube.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ LocalFileFormat::read(std::istream & istream,
241241
char domainMinB[64] = "";
242242

243243
#ifdef _WIN32
244-
if (sscanf_s(line.c_str(), "domain_min %s %s %s %c", domainMinR, 64, domainMinG, 64, domainMinB, 64, &endTok, 1) != 3)
244+
if (sscanf_s(line.c_str(), "domain_min %63s %63s %63s %c", domainMinR, 64, domainMinG, 64, domainMinB, 64, &endTok, 1) != 3)
245245
#else
246-
if (sscanf(line.c_str(), "domain_min %s %s %s %c", domainMinR, domainMinG, domainMinB, &endTok) != 3)
246+
if (sscanf(line.c_str(), "domain_min %63s %63s %63s %c", domainMinR, domainMinG, domainMinB, &endTok) != 3)
247247
#endif
248248
{
249249
ThrowErrorMessage(
@@ -275,9 +275,9 @@ LocalFileFormat::read(std::istream & istream,
275275
char domainMaxB[64] = "";
276276

277277
#ifdef _WIN32
278-
if (sscanf_s(line.c_str(), "domain_max %s %s %s %c", domainMaxR, 64, domainMaxG, 64, domainMaxB, 64, &endTok, 1) != 3)
278+
if (sscanf_s(line.c_str(), "domain_max %63s %63s %63s %c", domainMaxR, 64, domainMaxG, 64, domainMaxB, 64, &endTok, 1) != 3)
279279
#else
280-
if (sscanf(line.c_str(), "domain_max %s %s %s %c", domainMaxR, domainMaxG, domainMaxB, &endTok) != 3)
280+
if (sscanf(line.c_str(), "domain_max %63s %63s %63s %c", domainMaxR, domainMaxG, domainMaxB, &endTok) != 3)
281281
#endif
282282
{
283283
ThrowErrorMessage(

src/OpenColorIO/fileformats/FileFormatSpi1D.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
135135
char fromMinS[64] = "";
136136
char fromMaxS[64] = "";
137137
#ifdef _WIN32
138-
if (sscanf_s(lineBuffer, "From %s %s", fromMinS, 64, fromMaxS, 64) != 2)
138+
if (sscanf_s(lineBuffer, "From %63s %63s", fromMinS, 64, fromMaxS, 64) != 2)
139139
#else
140-
if (sscanf(lineBuffer, "From %s %s", fromMinS, fromMaxS) != 2)
140+
if (sscanf(lineBuffer, "From %63s %63s", fromMinS, fromMaxS) != 2)
141141
#endif
142142
{
143143
ThrowErrorMessage("Invalid 'From' Tag", currentLine, headerLine);
@@ -219,11 +219,11 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
219219

220220
char inputLUT[4][64] = {"", "", "", ""};
221221
#ifdef _WIN32
222-
if (sscanf_s(lineBuffer, "%s %s %s %63s", inputLUT[0], 64,
222+
if (sscanf_s(lineBuffer, "%63s %63s %63s %63s", inputLUT[0], 64,
223223
inputLUT[1], 64, inputLUT[2], 64, inputLUT[3],
224224
64) != components)
225225
#else
226-
if (sscanf(lineBuffer, "%s %s %s %63s", inputLUT[0],
226+
if (sscanf(lineBuffer, "%63s %63s %63s %63s", inputLUT[0],
227227
inputLUT[1], inputLUT[2], inputLUT[3]) != components)
228228
#endif
229229
{

src/OpenColorIO/fileformats/FileFormatSpi3D.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,13 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
153153
char blueValueS[64] = "";
154154

155155
#ifdef _WIN32
156-
if (sscanf(lineBuffer,
157-
"%d %d %d %s %s %s",
156+
if (sscanf_s(lineBuffer, "%d %d %d %63s %63s %63s",
158157
&rIndex, &gIndex, &bIndex,
159158
redValueS, 64,
160159
greenValueS, 64,
161160
blueValueS, 64) == 6)
162161
#else
163-
if (sscanf(lineBuffer, "%d %d %d %s %s %s",
162+
if (sscanf(lineBuffer, "%d %d %d %63s %63s %63s",
164163
&rIndex, &gIndex, &bIndex,
165164
redValueS, greenValueS, blueValueS) == 6)
166165
#endif

0 commit comments

Comments
 (0)