From 9597dcda87864684f08a5236222dd214b876fd1e Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 17 May 2015 15:23:39 +0000
Subject: [PATCH] throw when packet_buffer fails to allocate memory

---
 include/libtorrent/buffer.hpp | 34 +++++++++++++++++-----------------
 src/packet_buffer.cpp         |  3 +++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/include/libtorrent/buffer.hpp b/include/libtorrent/buffer.hpp
index e54b4b4ec..4afccd629 100644
--- a/include/libtorrent/buffer.hpp
+++ b/include/libtorrent/buffer.hpp
@@ -47,14 +47,14 @@ class buffer
 public:
 	struct interval
 	{
-	   interval()
-		  : begin(0)
-		  , end(0)
+	interval()
+		: begin(0)
+		, end(0)
 		{}
 
-	   interval(char* b, char* e)
-		  : begin(b)
-		  , end(e)
+	interval(char* b, char* e)
+		: begin(b)
+		, end(e)
 		{}
 
 		char operator[](int index) const
@@ -62,7 +62,7 @@ public:
 			TORRENT_ASSERT(begin + index < end);
 			return begin[index];
 		}
-		  
+
 		int left() const
 		{
 			TORRENT_ASSERT(end >= begin);
@@ -76,14 +76,14 @@ public:
 
 	struct const_interval
 	{
-	   const_interval(interval const& i)
-		  : begin(i.begin)
-		  , end(i.end)
+	const_interval(interval const& i)
+		: begin(i.begin)
+		, end(i.end)
 		{}
 
-	   const_interval(char const* b, char const* e)
-		  : begin(b)
-		  , end(e)
+	const_interval(char const* b, char const* e)
+		: begin(b)
+		, end(e)
 		{}
 
 		char operator[](int index) const
@@ -168,7 +168,7 @@ public:
 	{ return interval(m_begin, m_begin + m_size); }
 	buffer::const_interval data() const
 	{ return const_interval(m_begin, m_begin + m_size); }
-	
+
 	void resize(std::size_t n)
 	{
 		TORRENT_ASSERT(n < 0xffffffffu);
@@ -185,7 +185,7 @@ public:
 			std::memcpy(m_begin + p, first, last - first);
 			return;
 		}
-		
+
 		resize(size() + last - first);
 		std::memmove(m_begin + p + (last - first), m_begin + p, last - first);
 		std::memcpy(m_begin + p, first, last - first);
@@ -196,7 +196,7 @@ public:
 		TORRENT_ASSERT(e <= m_begin + m_size);
 		TORRENT_ASSERT(b >= m_begin);
 		TORRENT_ASSERT(b <= e);
-	 	if (e == m_begin + m_size)
+		if (e == m_begin + m_size)
 		{
 			resize(b - m_begin);
 			return;
@@ -206,7 +206,7 @@ public:
 		TORRENT_ASSERT(e - b <= std::numeric_limits<boost::uint32_t>::max());
 		TORRENT_ASSERT(boost::uint32_t(e - b) <= m_size);
 		m_size -= e - b;
-	 }
+	}
 
 	void clear() { m_size = 0; }
 	std::size_t size() const { return m_size; }
diff --git a/src/packet_buffer.cpp b/src/packet_buffer.cpp
index b0178a611..37e9b7f6c 100644
--- a/src/packet_buffer.cpp
+++ b/src/packet_buffer.cpp
@@ -157,6 +157,9 @@ namespace libtorrent {
 			new_size <<= 1;
 
 		void** new_storage = (void**)malloc(sizeof(void*) * new_size);
+#ifndef BOOST_NO_EXCEPTIONS
+		if (new_storage == NULL) throw std::bad_alloc();
+#endif
 
 		for (index_type i = 0; i < new_size; ++i)
 			new_storage[i] = 0;