Merge pull request #1455 from TiemoJung/nullpointer_crash_fix

Fixes a crash when in/out varying variable had no semantic name and a…

Merge pull request #1455 from TiemoJung/nullpointer_crash_fix
6e382f63 · John Kessenich · GitHub · e161cc11 · 9f8cb850 · 6e382f63
Unverified Commit 6e382f63 authored Jul 25, 2018 by John Kessenich Committed by GitHub Jul 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

iomapper.cpp glslang/MachineIndependent/iomapper.cpp +8 -2

No files found.
--- a/glslang/MachineIndependent/iomapper.cpp
+++ b/glslang/MachineIndependent/iomapper.cpp
@@ -331,8 +331,14 @@ struct TResolverInOutAdaptor
                                                      ent.symbol->getType(),
                                                      ent.live);
        } else {
-            TString errorMsg = "Invalid shader In/Out variable semantic: ";
+            TString errorMsg;
-            errorMsg += ent.symbol->getType().getQualifier().semanticName;
+            if (ent.symbol->getType().getQualifier().semanticName != nullptr) {
+                errorMsg = "Invalid shader In/Out variable semantic: ";
+                errorMsg += ent.symbol->getType().getQualifier().semanticName;
+            } else {
+                errorMsg = "Invalid shader In/Out variable: ";
+                errorMsg += ent.symbol->getName();
+            }
            infoSink.info.message(EPrefixInternalError, errorMsg.c_str());
            error = true;
        }