Strip null characters from the shader source when building translated source.

Some shaders had trailing null characters that caused the resulting translated source string to not output correctly. BUG=angleproject:1144 Change-Id: I7cd725ee54c9e934fd3cc511de9c2a3c34ac3eec Reviewed-on: https://chromium-review.googlesource.com/461272Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Strip null characters from the shader source when building translated source.
9e1bf10b · Geoff Lang · Commit Bot · 8f77e5d3 · 9e1bf10b
Commit 9e1bf10b authored Mar 28, 2017 by Geoff Lang Committed by Commit Bot Mar 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

Shader.cpp src/libANGLE/Shader.cpp +6 -7

No files found.
--- a/src/libANGLE/Shader.cpp
+++ b/src/libANGLE/Shader.cpp
@@ -296,15 +296,14 @@ void Shader::compile(const Context *context)
    shaderStream << "// GLSL\n";
    shaderStream << "//\n";
-    size_t curPos = 0;
+    std::istringstream inputSourceStream(mState.mSource);
-    while (curPos != std::string::npos)
+    std::string line;
+    while (std::getline(inputSourceStream, line))
    {
-        size_t nextLine = mState.mSource.find("\n", curPos);
+        // Remove null characters from the source line
-        size_t len      = (nextLine == std::string::npos) ? std::string::npos : (nextLine - curPos + 1);
+        line.erase(std::remove(line.begin(), line.end(), '\0'), line.end());
-        shaderStream << "// " << mState.mSource.substr(curPos, len);
+        shaderStream << "// " << line;
-        curPos = (nextLine == std::string::npos) ? std::string::npos : (nextLine + 1);
    }
    shaderStream << "\n\n";
    shaderStream << mState.mTranslatedSource;