Skip to content

Commit 9cfb3f0

Browse files
authored
Merge pull request #1063 from Devsh-Graphics-Programming/shader_compiler_opt_null_deref
Fix nullptr deref when providing no optimizer to the compiler
2 parents d6c0f3e + 882950e commit 9cfb3f0

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

include/nbl/asset/utils/IShaderCompiler.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,16 +366,16 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
366366
{
367367
public:
368368
inline bool operator==(const SCompilerArgs& other) const {
369-
bool retVal = true;
370-
if (stage != other.stage || targetSpirvVersion != other.targetSpirvVersion || debugInfoFlags != other.debugInfoFlags || preprocessorArgs != other.preprocessorArgs || optimizerIsExtraPasses != other.optimizerIsExtraPasses) retVal = false;
371-
if (optimizerPasses.size() != other.optimizerPasses.size()) retVal = false;
369+
if (stage != other.stage || targetSpirvVersion != other.targetSpirvVersion || debugInfoFlags != other.debugInfoFlags || preprocessorArgs != other.preprocessorArgs || optimizerIsExtraPasses != other.optimizerIsExtraPasses)
370+
return false;
371+
if (optimizerPasses.size() != other.optimizerPasses.size())
372+
return false;
372373
for (auto passesIt = optimizerPasses.begin(), otherPassesIt = other.optimizerPasses.begin(); passesIt != optimizerPasses.end(); passesIt++, otherPassesIt++) {
373374
if (*passesIt != *otherPassesIt) {
374-
retVal = false;
375-
break;
375+
return false;
376376
}
377377
}
378-
return retVal;
378+
return true;
379379
}
380380

381381
private:

0 commit comments

Comments
 (0)