guard against potential integer overflow in allocators

1 files changed, 17 insertions, 0 deletions

diff --git a/misc.cpp b/misc.cpp
index 27a9a354..825b4466 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -6,6 +6,7 @@
 
 #include "misc.h"
 #include "words.h"
+#include <new>
 
 NAMESPACE_BEGIN(CryptoPP)
 
@@ -75,6 +76,22 @@ unsigned long Crop(unsigned long value, unsigned int size)
 		return value;
 }
 
+#if !(defined(_MSC_VER) && (_MSC_VER < 1300))
+using std::new_handler;
+#endif
+
+void CallNewHandler()
+{
+	new_handler newHandler = set_new_handler(NULL);
+	if (newHandler)
+		set_new_handler(newHandler);
+
+	if (newHandler)
+		newHandler();
+	else
+		throw std::bad_alloc();
+}
+
 NAMESPACE_END
 
 #endif