Fixed leak in internal_error backtraces.

Author: rakshasa

src/data/hash_chunk.cc

@@ -1,65 +1,22 @@
-// libTorrent - BitTorrent library
-// Copyright (C) 2005-2011, Jari Sundell
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-// In addition, as a special exception, the copyright holders give
-// permission to link the code of portions of this program with the
-// OpenSSL library under certain conditions as described in each
-// individual source file, and distribute linked combinations
-// including the two.
-//
-// You must obey the GNU General Public License in all respects for
-// all of the code used other than OpenSSL.  If you modify file(s)
-// with this exception, you may extend this exception to your version
-// of the file(s), but you are not obligated to do so.  If you do not
-// wish to do so, delete this exception statement from your version.
-// If you delete this exception statement from all source files in the
-// program, then also delete it here.
-//
-// Contact:  Jari Sundell <jaris@ifi.uio.no>
-//
-//           Skomakerveien 33
-//           3185 Skoppum, NORWAY
-
 #include "config.h"
 
 #include "chunk.h"
 #include "chunk_list_node.h"
 #include "hash_chunk.h"
-#include "utils/sha1.h"
 
 namespace torrent {
 
-HashChunk::~HashChunk() = default;
-
-HashChunk::HashChunk(ChunkHandle h) {
-  m_hash = std::make_unique<Sha1>();
-  set_chunk(h);
-}
-
 void
 HashChunk::set_chunk(ChunkHandle h) {
   m_position = 0;
   m_chunk    = h;
-  m_hash->init();
+
+  m_hash.init();
 }
 
 void
 HashChunk::hash_c(char* buffer) {
-  m_hash->final_c(buffer);
+  m_hash.final_c(buffer);
 }
 
 bool
@@ -68,7 +25,7 @@ HashChunk::perform(uint32_t length, bool force) {
 
   if (m_position + length > m_chunk.chunk()->chunk_size())
     throw internal_error("HashChunk::perform(...) received length out of range");
-  
+
   uint32_t l = force ? length : m_chunk.chunk()->incore_length(m_position);
 
   bool complete = l == length;
@@ -109,7 +66,7 @@ uint32_t
 HashChunk::perform_part(Chunk::iterator itr, uint32_t length) {
   length = std::min(length, remaining_part(itr, m_position));
 
-  m_hash->update(itr->chunk().begin() + m_position - itr->position(), length);
+  m_hash.update(itr->chunk().begin() + m_position - itr->position(), length);
   m_position += length;
 
   return length;

src/data/hash_chunk.h

@@ -3,10 +3,10 @@
 
 #include <memory>
 
-#include "torrent/exceptions.h"
-
 #include "chunk.h"
 #include "chunk_handle.h"
+#include "torrent/exceptions.h"
+#include "utils/sha1.h"
 
 namespace torrent {
 
@@ -15,26 +15,25 @@ namespace torrent {
 // stuff related to performance and responsiveness.
 
 class ChunkListNode;
-class Sha1;
 
 class HashChunk {
 public:
-  ~HashChunk();
   HashChunk(ChunkHandle h);
-
-  void                set_chunk(ChunkHandle h);
+  ~HashChunk() = default;
 
   ChunkHandle*        chunk()                                 { return &m_chunk; }
   ChunkHandle&        handle()                                { return m_chunk; }
+  uint32_t            remaining();
+
+  void                set_chunk(ChunkHandle h);
+
   void                hash_c(char* buffer);
 
   // If force is true, then the return value is always true.
   bool                perform(uint32_t length, bool force = true);
 
   void                advise_willneed(uint32_t length);
 
-  uint32_t            remaining();
-
 private:
   HashChunk(const HashChunk&) = delete;
   HashChunk& operator=(const HashChunk&) = delete;
@@ -45,9 +44,14 @@ class HashChunk {
   uint32_t            m_position;
 
   ChunkHandle         m_chunk;
-  std::unique_ptr<Sha1> m_hash;
+  Sha1                m_hash;
 };
 
+inline
+HashChunk::HashChunk(ChunkHandle h) {
+  set_chunk(h);
+}
+
 inline uint32_t
 HashChunk::remaining_part(Chunk::iterator itr, uint32_t pos) {
   return itr->size() - (pos - itr->position());

src/torrent/exceptions.cc

@@ -57,6 +57,7 @@ internal_error::initialize(const std::string& msg) {
   }
 
   m_backtrace = output.str();
+  ::free(stack_symbol_names);
 
 #else
   m_backtrace = "stack dump not enabled";