From 31077a813cad7d01c9f086bdd6cbfaae7250df85 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Wed, 3 Dec 2014 22:17:42 +1100 Subject: [PATCH] Don't use malloc --- src/shader/shader.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/shader/shader.cpp b/src/shader/shader.cpp index 06bdcb34c..f083beaa4 100644 --- a/src/shader/shader.cpp +++ b/src/shader/shader.cpp @@ -43,10 +43,9 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo GLint logLength; glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength); if (logLength > 0) { - GLchar *log = reinterpret_cast(malloc(logLength)); - glGetProgramInfoLog(program, logLength, &logLength, log); - Log::Error(Event::Shader, "Program failed to link: %s", log); - free(log); + std::unique_ptr log = mbgl::util::make_unique(logLength); + glGetProgramInfoLog(program, logLength, &logLength, log.get()); + Log::Error(Event::Shader, "Program failed to link: %s", log.get()); } glDeleteShader(vertShader); @@ -69,10 +68,9 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo GLint logLength; glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength); if (logLength > 0) { - GLchar *log = reinterpret_cast(malloc(logLength)); - glGetProgramInfoLog(program, logLength, &logLength, log); - Log::Error(Event::Shader, "Program failed to validate: %s", log); - free(log); + std::unique_ptr log = mbgl::util::make_unique(logLength); + glGetProgramInfoLog(program, logLength, &logLength, log.get()); + Log::Error(Event::Shader, "Program failed to validate: %s", log.get()); } glDeleteShader(vertShader); @@ -110,10 +108,9 @@ bool Shader::compileShader(GLuint *shader, GLenum type, const GLchar *source) { GLint logLength; glGetShaderiv(*shader, GL_INFO_LOG_LENGTH, &logLength); if (logLength > 0) { - GLchar *log = reinterpret_cast(malloc(logLength)); - glGetShaderInfoLog(*shader, logLength, &logLength, log); - Log::Error(Event::Shader, "Shader failed to compile: %s", log); - free(log); + std::unique_ptr log = mbgl::util::make_unique(logLength); + glGetShaderInfoLog(*shader, logLength, &logLength, log.get()); + Log::Error(Event::Shader, "Shader failed to compile: %s", log.get()); } glDeleteShader(*shader);