commit f60fab6d154f4c9bf599e92976cd8cee7f8633e0
author Geoff Lang <geofflang@chromium.org> Mon Nov 24 11:21:20 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Mon Nov 24 19:05:29 2014 +0000
tree 4a127c4d4301debc4c19147afabef40b0c92311b
parent 3b23162968cdb7fb76aef74e979d8ea1fd256a8d

Fix handling of shader source with fixed length.

BUG=angle:837

Change-Id: Ie9c3059ad2973b0733be92b7548525ee694bb1fa
Reviewed-on: https://chromium-review.googlesource.com/231612
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Shader.cpp

diff --git a/src/libANGLE/Shader.cpp b/src/libANGLE/Shader.cpp
index 89aa87c..0a4c066 100644
--- a/src/libANGLE/Shader.cpp
+++ b/src/libANGLE/Shader.cpp
@@ -51,7 +51,14 @@
 
     for (int i = 0; i < count; i++)
     {
-        stream << string[i];
+        if (length == nullptr || length[i] < 0)
+        {
+            stream.write(string[i], std::strlen(string[i]));
+        }
+        else
+        {
+            stream.write(string[i], length[i]);
+        }
     }
 
     mSource = stream.str();