summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gpu/command_buffer/client/gles2_implementation.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index b7b72a7..2519ba0 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -622,7 +622,8 @@ void GLES2Implementation::SetGLError(GLenum error, const char* msg) {
last_error_ = msg;
}
if (error_message_callback_) {
- std::string temp(GLES2Util::GetStringError(error) + " : " + msg);
+ std::string temp(GLES2Util::GetStringError(error) + " : " +
+ (msg ? msg : ""));
error_message_callback_->OnErrorMessage(temp.c_str(), 0);
}
error_bits_ |= GLES2Util::GLErrorToErrorBit(error);