mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: fix crash on empty sequence node passed to intrinsic expansions

Browse Source
This commit is contained in:
steve-lunarg
2017-03-31 12:47:34 -06:00
parent 9ce76553b8
commit db2e3b4169
4 changed files with 141 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hlsl/hlslParseHelper.cpp
View File

@@ -2272,6 +2272,9 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte
if (argAggregate == nullptr)
return;
if (argAggregate->getSequence().empty())
return;
// Buffer is the object upon which method is called, so always arg 0
TIntermTyped* bufferObj = argAggregate->getSequence()[0]->getAsTyped();
@@ -3747,7 +3750,9 @@ TIntermTyped* HlslParseContext::handleFunctionCall(const TSourceLoc& loc, TFunct
// the symbol table for an arbitrary type. This is a temporary hack until that ability exists.
// It will have false positives, since it doesn't check arg counts or types.
if (arguments && arguments->getAsAggregate()) {
if (isStructBufferType(arguments->getAsAggregate()->getSequence()[0]->getAsTyped()->getType())) {
const TIntermSequence& sequence = arguments->getAsAggregate()->getSequence();
if (!sequence.empty() && isStructBufferType(sequence[0]->getAsTyped()->getType())) {
static const int methodPrefixSize = sizeof(BUILTIN_PREFIX)-1;
if (function->getName().length() > methodPrefixSize &&