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
parent 978702d8
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1013 #define BUILD_REVISION 1017
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -2454,14 +2454,14 @@ void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) ...@@ -2454,14 +2454,14 @@ void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
{ {
int index = 0; int index = 0;
if (mInfoLog) if (bufSize > 0)
{ {
index = std::min(bufSize - 1, (int)strlen(mInfoLog)); if (mInfoLog)
memcpy(infoLog, mInfoLog, index); {
} index = std::min(bufSize - 1, (int)strlen(mInfoLog));
memcpy(infoLog, mInfoLog, index);
}
if (bufSize)
{
infoLog[index] = '\0'; infoLog[index] = '\0';
} }
......
...@@ -102,14 +102,14 @@ void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) ...@@ -102,14 +102,14 @@ void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
{ {
int index = 0; int index = 0;
if (mInfoLog) if (bufSize > 0)
{ {
index = std::min(bufSize - 1, (int)strlen(mInfoLog)); if (mInfoLog)
memcpy(infoLog, mInfoLog, index); {
} index = std::min(bufSize - 1, (int)strlen(mInfoLog));
memcpy(infoLog, mInfoLog, index);
}
if (bufSize)
{
infoLog[index] = '\0'; infoLog[index] = '\0';
} }
...@@ -147,14 +147,14 @@ void Shader::getSourceImpl(char *source, GLsizei bufSize, GLsizei *length, char ...@@ -147,14 +147,14 @@ void Shader::getSourceImpl(char *source, GLsizei bufSize, GLsizei *length, char
{ {
int index = 0; int index = 0;
if (source) if (bufSize > 0)
{ {
index = std::min(bufSize - 1, (int)strlen(source)); if (source)
memcpy(buffer, source, index); {
} index = std::min(bufSize - 1, (int)strlen(source));
memcpy(buffer, source, index);
}
if (bufSize)
{
buffer[index] = '\0'; buffer[index] = '\0';
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment