Make sure source strings are terminated (#1641)

* Make sure source strings are terminated The source strings may or may not have a null terminator. We need to make sure we add one before outputting the source strings as we iterate over the c-str looking for the null terminator. * Review feedback

Make sure source strings are terminated (#1641)
e96fa717 · dan sinclair · John Kessenich · 6eab476e · e96fa717 · e96fa717
Commit e96fa717 authored Jan 07, 2019 by dan sinclair Committed by John Kessenich Jan 07, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

ShaderLang.cpp glslang/MachineIndependent/ShaderLang.cpp +5 -2

localintermediate.h glslang/MachineIndependent/localintermediate.h +1 -1

No files found.
--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -879,8 +879,11 @@ bool ProcessDeferred(
        intermediate.setHlslOffsets();
    if (messages & EShMsgDebugInfo) {
        intermediate.setSourceFile(names[numPre]);
-        for (int s = 0; s < numStrings; ++s)
+        for (int s = 0; s < numStrings; ++s) {
-            intermediate.addSourceText(strings[numPre + s]);
+            // The string may not be null-terminated, so make sure we provide
+            // the length along with the string.
+            intermediate.addSourceText(strings[numPre + s], lengths[numPre + s]);
+        }
    }
    SetupBuiltinSymbolTable(version, profile, spvVersion, source);

--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -666,7 +666,7 @@ public:
    void setSourceFile(const char* file) { if (file != nullptr) sourceFile = file; }
    const std::string& getSourceFile() const { return sourceFile; }
-    void addSourceText(const char* text) { sourceText = sourceText + text; }
+    void addSourceText(const char* text, size_t len) { sourceText.append(text, len); }
    const std::string& getSourceText() const { return sourceText; }
    const std::map<std::string, std::string>& getIncludeText() const { return includeText; }
    void addIncludeText(const char* name, const char* text, size_t len) { includeText[name].assign(text,len); }