Merge 91eab2b5d2 into 77938cd0be

third_party/libmodplug/src/sndfile.cpp

@@ -339,8 +339,13 @@ BOOL CSoundFile::Destroy()
 MODCOMMAND *CSoundFile::AllocatePattern(UINT rows, UINT nchns)
 //------------------------------------------------------------
 {
+	try {
 		MODCOMMAND *p = new MODCOMMAND[rows*nchns];
-	if (p) memset(p, 0, rows*nchns*sizeof(MODCOMMAND));
+		memset(p, 0, rows*nchns*sizeof(MODCOMMAND));
+	}
+	catch (std::bad_alloc& ba) {
+	}
+
 	return p;
 }
 
@@ -1777,8 +1782,15 @@ BOOL CSoundFile::SetPatternName(UINT nPat, LPCSTR lpszName)
 	{
 		if (!lpszName[0]) return TRUE;
 		UINT len = (nPat+1)*MAX_PATTERNNAME;
-		char *p = new char[len];
-		if (!p) return FALSE;
+
+		char *p;
+		try {
+			p = new char[len];
+		}
+		catch (std::bad_alloc& ba) {
+			return FALSE;
+		}
+
 		memset(p, 0, len);
 		if (m_lpszPatternNames)
 		{

third_party/libmodplug/src/sndfile.h

@@ -13,6 +13,8 @@
 #ifndef __SNDFILE_H
 #define __SNDFILE_H
 
+#include <new>
+
 #ifdef UNDER_CE
 int _strnicmp(const char *str1,const char *str2, int n);
 #endif