Merge 93d114f8c9 into 258f5ad21f

third_party/libmodplug/src/load_mdl.cpp

@@ -243,12 +243,13 @@ BOOL CSoundFile::ReadMDL(const BYTE *lpStream, DWORD dwMemLength)
 			if (blocklen)
 			{
 				if (m_lpszSongComments) delete [] m_lpszSongComments;
+				try {
 					m_lpszSongComments = new char[blocklen];
-				if (m_lpszSongComments)
-				{
 					memcpy(m_lpszSongComments, lpStream + dwMemPos, blocklen);
 					m_lpszSongComments[blocklen - 1] = 0;
 				}
+				catch (std::bad_alloc& ba) {
+				}
 			}
 			break;
 		// PA: Pattern Data
@@ -288,7 +289,13 @@ BOOL CSoundFile::ReadMDL(const BYTE *lpStream, DWORD dwMemLength)
 				if (!Headers[nins])
 				{
 					UINT note = 12;
-					if ((Headers[nins] = new INSTRUMENTHEADER) == NULL) break;
+					try {
+						Headers[nins] = new INSTRUMENTHEADER;
+					}
+					catch (std::bad_alloc& ba) {
+						break;
+					}
+
 					INSTRUMENTHEADER *penv = Headers[nins];
 					memset(penv, 0, sizeof(INSTRUMENTHEADER));
 					memcpy(penv->name, lpStream+dwPos+2, 32);

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