Merge 818d2d04e8 into 77938cd0be

third_party/libmodplug/src/load_ult.cpp

@@ -64,16 +64,17 @@ BOOL CSoundFile::ReadUlt(const BYTE *lpStream, DWORD dwMemLength)
 	if ((pmh->reserved) && (dwMemPos + pmh->reserved * 32 < dwMemLength))
 	{
 		UINT len = pmh->reserved * 32;
-		m_lpszSongComments = new char[len + 1 + pmh->reserved];
+		try {
-		if (m_lpszSongComments)
+			m_lpszSongComments = new char[len + 1 + pmh->reserved];
-		{
+			for (UINT l = 0; l < pmh->reserved; l++)
-			for (UINT l=0; l<pmh->reserved; l++)
 			{
-				memcpy(m_lpszSongComments+l*33, lpStream+dwMemPos+l*32, 32);
+				memcpy(m_lpszSongComments + l * 33, lpStream + dwMemPos + l * 32, 32);
-				m_lpszSongComments[l*33+32] = 0x0D;
+				m_lpszSongComments[l * 33 + 32] = 0x0D;
 			}
 			m_lpszSongComments[len] = 0;
 		}
+		catch (std::bad_alloc& ba) {
+		}
 		dwMemPos += len;
 	}
 	if (dwMemPos >= dwMemLength) return TRUE;

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