diff options
Diffstat (limited to 'source/slang')
| -rwxr-xr-x | source/slang/slang-compiler.h | 17 | ||||
| -rw-r--r-- | source/slang/slang.cpp | 6 |
2 files changed, 22 insertions, 1 deletions
diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h index fc97a2f47..770449de7 100755 --- a/source/slang/slang-compiler.h +++ b/source/slang/slang-compiler.h @@ -1335,6 +1335,11 @@ namespace Slang char const* name, slang::IEntryPoint** outEntryPoint) SLANG_OVERRIDE { + if (outEntryPoint == nullptr) + { + return SLANG_E_INVALID_ARG; + } + ComPtr<slang::IEntryPoint> entryPoint(findEntryPointByName(UnownedStringSlice(name))); if((!entryPoint)) return SLANG_FAIL; @@ -1349,6 +1354,11 @@ namespace Slang slang::IEntryPoint** outEntryPoint, ISlangBlob** outDiagnostics) override { + if (outEntryPoint == nullptr) + { + return SLANG_E_INVALID_ARG; + } + ComPtr<slang::IEntryPoint> entryPoint(findAndCheckEntryPoint(UnownedStringSlice(name), stage, outDiagnostics)); if ((!entryPoint)) return SLANG_FAIL; @@ -1367,6 +1377,11 @@ namespace Slang if (index < 0 || index >= m_entryPoints.getCount()) return SLANG_E_INVALID_ARG; + if (outEntryPoint == nullptr) + { + return SLANG_E_INVALID_ARG; + } + ComPtr<slang::IEntryPoint> entryPoint(m_entryPoints[index].Ptr()); *outEntryPoint = entryPoint.detach(); return SLANG_OK; @@ -1541,7 +1556,7 @@ namespace Slang // List of source files this module depends on FileDependencyList m_fileDependencyList; - // Entry points that were defined in thsi module + // Entry points that were defined in this module // // Note: the entry point defined in the module are *not* // part of the memory image/layout of the module when diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 4d83823d2..c6af8b34d 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -1266,6 +1266,9 @@ SLANG_NO_THROW SlangResult SLANG_MCALL Linkage::createCompositeComponentType( slang::IComponentType** outCompositeComponentType, ISlangBlob** outDiagnostics) { + if (outCompositeComponentType == nullptr) + return SLANG_E_INVALID_ARG; + SLANG_AST_BUILDER_RAII(getASTBuilder()); // Attempting to create a "composite" of just one component type should @@ -1491,6 +1494,9 @@ SLANG_NO_THROW SlangResult SLANG_MCALL Linkage::createTypeConformanceComponentTy SlangInt conformanceIdOverride, ISlangBlob** outDiagnostics) { + if (outConformanceComponentType == nullptr) + return SLANG_E_INVALID_ARG; + SLANG_AST_BUILDER_RAII(getASTBuilder()); RefPtr<TypeConformance> result; |