From: John Kessenich Date: Mon, 28 Nov 2016 00:32:19 +0000 (-0700) Subject: Fix crash by returning early from finalCheck() if there is no tree to process. X-Git-Tag: upstream/11.4.0~1409 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c98904014a258e446b5dc0edd26607a7085c17b;p=platform%2Fupstream%2Fglslang.git Fix crash by returning early from finalCheck() if there is no tree to process. --- diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 21df38d..66fec1a 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1663" +#define GLSLANG_REVISION "Overload400-PrecQual.1664" #define GLSLANG_DATE "27-Nov-2016" diff --git a/glslang/MachineIndependent/linkValidate.cpp b/glslang/MachineIndependent/linkValidate.cpp index bc473ab..050fdae 100644 --- a/glslang/MachineIndependent/linkValidate.cpp +++ b/glslang/MachineIndependent/linkValidate.cpp @@ -377,6 +377,9 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy // void TIntermediate::finalCheck(TInfoSink& infoSink) { + if (getTreeRoot() == nullptr) + return; + if (numEntryPoints < 1) { if (source == EShSourceGlsl) error(infoSink, "Missing entry point: Each stage requires one entry point");