kc3-lang/angle/src/libANGLE/Error.cpp

• Show log

  Commit

• Hash : ce95d05b
  Author :
  Date : 2015-12-20T22:20:14
  

  Fixed memory leak in egl::Error and gl::Error
  
  Move assignment operator of both classes contained a memory leak.
  Changed type of mMessage from mutable std::string *to mutable
  std::unique_ptr<std::string>
  
  BUG=angleproject:1264
  
  Change-Id: I7d1419b2e9f385b36afebfd6371983be33ee9e61
  Reviewed-on: https://chromium-review.googlesource.com/319520
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Tryjob-Request: Tibor Ouden, den <tibordenouden@gmail.com>
  Tested-by: Jamie Madill <jmadill@chromium.org>
  

Download

• src/libANGLE/Error.cpp

• //
  // Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  
  // Error.cpp: Implements the egl::Error and gl::Error classes which encapsulate API errors
  // and optional error messages.
  
  #include "libANGLE/Error.h"
  
  #include "common/angleutils.h"
  
  #include <cstdarg>
  
  namespace gl
  {
  
  Error::Error(GLenum errorCode, const char *msg, ...) : mCode(errorCode), mID(errorCode)
  {
      va_list vararg;
      va_start(vararg, msg);
      createMessageString();
      *mMessage = FormatString(msg, vararg);
      va_end(vararg);
  }
  
  Error::Error(GLenum errorCode, GLuint id, const char *msg, ...) : mCode(errorCode), mID(id)
  {
      va_list vararg;
      va_start(vararg, msg);
      createMessageString();
      *mMessage = FormatString(msg, vararg);
      va_end(vararg);
  }
  
  void Error::createMessageString() const
  {
      if (!mMessage)
      {
          mMessage.reset(new std::string);
      }
  }
  
  const std::string &Error::getMessage() const
  {
      createMessageString();
      return *mMessage;
  }
  
  bool Error::operator==(const Error &other) const
  {
      if (mCode != other.mCode)
          return false;
  
      // TODO(jmadill): Compare extended error codes instead of strings.
      if ((!mMessage || !other.mMessage) && (!mMessage != !other.mMessage))
          return false;
  
      return (*mMessage == *other.mMessage);
  }
  
  bool Error::operator!=(const Error &other) const
  {
      return !(*this == other);
  }
  }
  
  namespace egl
  {
  
  Error::Error(EGLint errorCode, const char *msg, ...) : mCode(errorCode), mID(0)
  {
      va_list vararg;
      va_start(vararg, msg);
      createMessageString();
      *mMessage = FormatString(msg, vararg);
      va_end(vararg);
  }
  
  Error::Error(EGLint errorCode, EGLint id, const char *msg, ...) : mCode(errorCode), mID(id)
  {
      va_list vararg;
      va_start(vararg, msg);
      createMessageString();
      *mMessage = FormatString(msg, vararg);
      va_end(vararg);
  }
  
  void Error::createMessageString() const
  {
      if (!mMessage)
      {
          mMessage.reset(new std::string);
      }
  }
  
  const std::string &Error::getMessage() const
  {
      createMessageString();
      return *mMessage;
  }
  
  }
  

Download