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

• 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.inl

• //
  // 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.inl: Inline definitions of egl::Error and gl::Error classes which encapsulate API errors
  // and optional error messages.
  
  #include "common/angleutils.h"
  
  #include <cstdarg>
  
  namespace gl
  {
  
  Error::Error(GLenum errorCode)
      : mCode(errorCode),
        mID(errorCode)
  {
  }
  
  Error::Error(const Error &other)
      : mCode(other.mCode),
        mID(other.mID)
  {
      if (other.mMessage)
      {
          createMessageString();
          *mMessage = *(other.mMessage);
      }
  }
  
  Error::Error(Error &&other)
      : mCode(other.mCode),
        mID(other.mID),
        mMessage(std::move(other.mMessage))
  {
  }
  
  Error &Error::operator=(const Error &other)
  {
      mCode = other.mCode;
      mID = other.mID;
  
      if (other.mMessage)
      {
          createMessageString();
          *mMessage = *(other.mMessage);
      }
      else
      {
          mMessage.release();
      }
  
      return *this;
  }
  
  Error &Error::operator=(Error &&other)
  {
      if (this != &other)
      {
          mCode = other.mCode;
          mID = other.mID;
          mMessage = std::move(other.mMessage);
      }
  
      return *this;
  }
  
  GLenum Error::getCode() const
  {
      return mCode;
  }
  
  GLuint Error::getID() const
  {
      return mID;
  }
  
  bool Error::isError() const
  {
      return (mCode != GL_NO_ERROR);
  }
  
  }
  
  namespace egl
  {
  
  Error::Error(EGLint errorCode)
      : mCode(errorCode),
        mID(0)
  {
  }
  
  Error::Error(const Error &other)
      : mCode(other.mCode),
        mID(other.mID)
  {
      if (other.mMessage)
      {
          createMessageString();
          *mMessage = *(other.mMessage);
      }
  }
  
  Error::Error(Error &&other)
      : mCode(other.mCode),
        mID(other.mID),
        mMessage(std::move(other.mMessage))
  {
  }
  
  Error &Error::operator=(const Error &other)
  {
      mCode = other.mCode;
      mID = other.mID;
  
      if (other.mMessage)
      {
          createMessageString();
          *mMessage = *(other.mMessage);
      }
      else
      {
          mMessage.release();
      }
  
      return *this;
  }
  
  Error &Error::operator=(Error &&other)
  {
      if (this != &other)
      {
          mCode = other.mCode;
          mID = other.mID;
          mMessage = std::move(other.mMessage);
      }
  
      return *this;
  }
  
  EGLint Error::getCode() const
  {
      return mCode;
  }
  
  EGLint Error::getID() const
  {
      return mID;
  }
  
  bool Error::isError() const
  {
      return (mCode != EGL_SUCCESS);
  }
  
  }
  

Download