From 39f2527012034f9df9a1ed9e618d256651a5974e Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 23 Oct 2016 10:41:26 +0300
Subject: [PATCH] Fixed memory leak [#METR-2944].

---
 .../include/ext/shared_ptr_helper.hpp         | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/libs/libcommon/include/ext/shared_ptr_helper.hpp b/libs/libcommon/include/ext/shared_ptr_helper.hpp
index cedfc6dec98..e18a0ee8818 100644
--- a/libs/libcommon/include/ext/shared_ptr_helper.hpp
+++ b/libs/libcommon/include/ext/shared_ptr_helper.hpp
@@ -5,36 +5,55 @@
 namespace ext
 {
 
-/**
- * Class AllocateShared allow to make std::shared_ptr<T> from T with private constructor.
- * Derive your T class from shared_ptr_helper<T>, define him as friend and call allocate_shared()/make_shared() method.
-**/
-template <class T>
+/** Class AllocateShared allow to make std::shared_ptr<T> from T with private constructor.
+  * Derive your T class from shared_ptr_helper<T>, define him as friend and call allocate_shared()/make_shared() method.
+  */
+template <typename T>
 class shared_ptr_helper
 {
 protected:
 	typedef typename std::remove_const<T>::type TNoConst;
 
-	template <class TAlloc>
+	template <typename TAlloc>
 	struct Deleter
 	{
 		void operator()(typename TAlloc::value_type * ptr)
 		{
-			std::allocator_traits<TAlloc>::destroy(alloc, ptr);
+			using AllocTraits = std::allocator_traits<TAlloc>;
+			ptr->~TNoConst();
+			AllocTraits::deallocate(alloc, ptr, 1);
 		}
+
 		TAlloc alloc;
 	};
 
-	///see std::allocate_shared
-	template <class TAlloc, class ... TArgs>
-	static std::shared_ptr<T> allocate_shared(const TAlloc & alloc, TArgs && ... args)
+	/// see std::allocate_shared
+	template <typename TAlloc, typename ... TArgs>
+	static std::shared_ptr<T> allocate_shared(const TAlloc & alloc, TArgs &&... args)
 	{
+		using AllocTraits = std::allocator_traits<TAlloc>;
 		TAlloc alloc_copy(alloc);
-		return std::shared_ptr<TNoConst>(new (std::allocator_traits<TAlloc>::allocate(alloc_copy, 1)) TNoConst(std::forward<TArgs>(args)...), Deleter<TAlloc>(), alloc_copy);
+
+		auto ptr = AllocTraits::allocate(alloc_copy, 1);
+
+		try
+		{
+			new (ptr) TNoConst(std::forward<TArgs>(args)...);
+		}
+		catch (...)
+		{
+			AllocTraits::deallocate(alloc_copy, ptr, 1);
+			throw;
+		}
+
+		return std::shared_ptr<TNoConst>(
+			ptr,
+			Deleter<TAlloc>(),
+			alloc_copy);
 	}
 
-	template <class ... TArgs>
-	static std::shared_ptr<T> make_shared(TArgs && ... args)
+	template <typename ... TArgs>
+	static std::shared_ptr<T> make_shared(TArgs &&... args)
 	{
 		return allocate_shared(std::allocator<TNoConst>(), std::forward<TArgs>(args)...);
 	}