commit 807d8c330197754898a9c50747536fb1c6b14c71
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Apr 04 15:06:04 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Apr 04 15:06:04 2012 +0000
tree 7c3ca0cc7476cbd9a95e2e270008b27626a334ed
parent 978702d871ab404b2e578c806bc27889510b4249

Fixed info log regressions.

TRAC #20443
Signed-off-by: Daniel Koch
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1017 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Shader.cpp

diff --git a/src/libGLESv2/Shader.cpp b/src/libGLESv2/Shader.cpp
index ac58abe..57fd3d5 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -102,14 +102,14 @@
 {
     int index = 0;
 
-    if (mInfoLog)
+    if (bufSize > 0)
     {
-        index = std::min(bufSize - 1, (int)strlen(mInfoLog));
-        memcpy(infoLog, mInfoLog, index);
-    }
+        if (mInfoLog)
+        {
+            index = std::min(bufSize - 1, (int)strlen(mInfoLog));
+            memcpy(infoLog, mInfoLog, index);
+        }
 
-    if (bufSize)
-    {
         infoLog[index] = '\0';
     }
 
@@ -147,14 +147,14 @@
 {
     int index = 0;
 
-    if (source)
+    if (bufSize > 0)
     {
-        index = std::min(bufSize - 1, (int)strlen(source));
-        memcpy(buffer, source, index);
-    }
+        if (source)
+        {
+            index = std::min(bufSize - 1, (int)strlen(source));
+            memcpy(buffer, source, index);
+        }
 
-    if (bufSize)
-    {
         buffer[index] = '\0';
     }