resolve alignment undefined behavior by enabling C++11

Author: Bamcane

CMakeLists.txt

@@ -58,6 +58,9 @@ endif()
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
 option(CLIENT "Compile client" ON)
 option(HEADLESS_CLIENT "Build the client without graphics" OFF)
 option(DOWNLOAD_DEPENDENCIES "Download dependencies (only available on Windows)" ${AUTO_DEPENDENCIES_DEFAULT})
@@ -142,6 +145,7 @@ if(NOT MSVC)
   add_c_compiler_flag_if_supported(OUR_FLAGS_OWN -Wno-missing-field-initializers)
   add_c_compiler_flag_if_supported(OUR_FLAGS_OWN -Wformat=2) # Warn about format strings.
   add_c_compiler_flag_if_supported(OUR_FLAGS_OWN -Wno-stringop-truncation)
+  add_c_compiler_flag_if_supported(OUR_FLAGS_OWN -fno-exceptions)
   add_c_compiler_flag_if_supported(OUR_FLAGS_DEP -Wno-implicit-function-declaration)
 endif()
 

bam.lua

@@ -92,7 +92,7 @@ end
 
 function GenerateCommonSettings(settings, conf, arch, compiler)
 	if compiler == "gcc" or compiler == "clang" then
-		settings.cc.flags:Add("-Wall", "-fno-exceptions")
+		settings.cc.flags:Add("-Wall", "-fno-exceptions", "-std=c++11")
 	end
 
 	-- Compile zlib if needed

src/engine/client/backend_sdl.cpp

@@ -292,7 +292,6 @@ bool CCommandProcessorFragment_OpenGL::SetState(const CCommandBuffer::CState &St
 	// texture handling
 	bool HasValidTexture = false;
 	int SrcBlendMode = GL_ONE;
-	bool IsAlphaOnly = m_aTextures[State.m_Texture].m_Format == CCommandBuffer::TEXFORMAT_ALPHA;
 	if(m_LastStainedOnly != State.m_IsStainedOnly)
 	{
 		glUniform1i(m_RenderShader.m_IsStainedOnlyLoc, State.m_IsStainedOnly ? 1 : 0);
@@ -301,6 +300,7 @@ bool CCommandProcessorFragment_OpenGL::SetState(const CCommandBuffer::CState &St
 
 	if(State.m_Texture >= 0 && State.m_Texture < CCommandBuffer::MAX_TEXTURES)
 	{
+		bool IsAlphaOnly = m_aTextures[State.m_Texture].m_Format == CCommandBuffer::TEXFORMAT_ALPHA;
 		if(m_aTextures[State.m_Texture].m_Valid)
 		{
 			if(m_LastTextureID != m_aTextures[State.m_Texture].m_Texture)

src/engine/client/serverbrowser.cpp

@@ -471,7 +471,7 @@ const char *CServerBrowser::GetFavoritePassword(const char *pAddress)
 CServerEntry *CServerBrowser::Add(int ServerlistType, const NETADDR &Addr)
 {
 	// create new pEntry
-	CServerEntry *pEntry = (CServerEntry *) m_aServerlist[ServerlistType].m_ServerlistHeap.Allocate(sizeof(CServerEntry));
+	CServerEntry *pEntry = (CServerEntry *) m_aServerlist[ServerlistType].m_ServerlistHeap.Allocate(sizeof(CServerEntry), alignof(CServerEntry));
 	mem_zero(pEntry, sizeof(CServerEntry));
 
 	// set the info

src/engine/client/textrender.cpp

@@ -467,7 +467,7 @@ CGlyph *CGlyphMap::GetGlyph(int Chr, int FontSizeIndex, bool Render)
 	// couldn't find glyph, render a new one
 	if(r.empty())
 	{
-		Index.m_pGlyph = (CGlyph *) m_Heap.Allocate(sizeof(CGlyph));
+		Index.m_pGlyph = (CGlyph *) m_Heap.Allocate(sizeof(CGlyph), alignof(CGlyph));
 		Index.m_pGlyph->m_Rendered = false;
 		Index.m_pGlyph->m_ID = Chr;
 		Index.m_pGlyph->m_FontSizeIndex = FontSizeIndex;

src/engine/shared/console.cpp

@@ -982,7 +982,7 @@ void CConsole::RegisterTemp(const char *pName, const char *pParams, int Flags, c
 	}
 	else
 	{
-		pCommand = new(m_TempCommands.Allocate(sizeof(CCommand))) CCommand(false);
+		pCommand = new(m_TempCommands.Allocate(sizeof(CCommand), alignof(CCommand))) CCommand(false);
 		char *pMem = static_cast<char *>(m_TempCommands.Allocate(TEMPCMD_NAME_LENGTH));
 		str_copy(pMem, pName, TEMPCMD_NAME_LENGTH);
 		pCommand->m_pName = pMem;

src/engine/shared/console.h

@@ -149,7 +149,7 @@ class CConsole : public IConsole
 
 		void AddEntry()
 		{
-			CQueueEntry *pEntry = static_cast<CQueueEntry *>(m_Queue.Allocate(sizeof(CQueueEntry)));
+			CQueueEntry *pEntry = static_cast<CQueueEntry *>(m_Queue.Allocate(sizeof(CQueueEntry), alignof(CQueueEntry)));
 			pEntry->m_pNext = 0;
 			if(!m_pFirst)
 				m_pFirst = pEntry;

src/engine/shared/demo.cpp

@@ -455,7 +455,7 @@ void CDemoPlayer::ScanFile()
 			if(ChunkType & CHUNKTICKFLAG_KEYFRAME)
 			{
 				// save the position
-				CKeyFrameSearch *pKey = (CKeyFrameSearch *) Heap.Allocate(sizeof(CKeyFrameSearch));
+				CKeyFrameSearch *pKey = (CKeyFrameSearch *) Heap.Allocate(sizeof(CKeyFrameSearch), alignof(CKeyFrameSearch));
 				pKey->m_Frame.m_Filepos = CurrentPos;
 				pKey->m_Frame.m_Tick = ChunkTick;
 				pKey->m_pNext = 0;

src/engine/shared/mapchecker.cpp

@@ -51,7 +51,7 @@ void CMapChecker::AddMaplist(const json_value *pMapList)
 		if(sha256_from_str(&Sha256, pSha256) == -1)
 			continue;
 
-		CWhitelistEntry *pEntry = (CWhitelistEntry *) m_Whitelist.Allocate(sizeof(CWhitelistEntry));
+		CWhitelistEntry *pEntry = (CWhitelistEntry *) m_Whitelist.Allocate(sizeof(CWhitelistEntry), alignof(CWhitelistEntry));
 		pEntry->m_pNext = m_pFirst;
 		m_pFirst = pEntry;
 
@@ -82,7 +82,7 @@ void CMapChecker::AddMaplist(const CMapVersion *pMaplist, unsigned Num)
 
 	for(unsigned i = 0; i < Num; ++i)
 	{
-		CWhitelistEntry *pEntry = (CWhitelistEntry *) m_Whitelist.Allocate(sizeof(CWhitelistEntry));
+		CWhitelistEntry *pEntry = (CWhitelistEntry *) m_Whitelist.Allocate(sizeof(CWhitelistEntry), alignof(CWhitelistEntry));
 		pEntry->m_pNext = m_pFirst;
 		m_pFirst = pEntry;
 

src/engine/shared/memheap.cpp

@@ -23,15 +23,19 @@ void CHeap::NewChunk()
 }
 
 //****************
-void *CHeap::AllocateFromChunk(unsigned int Size)
+void *CHeap::AllocateFromChunk(unsigned int Size, unsigned int Alignment)
 {
+	unsigned int Offset = ((unsigned long) m_pCurrent->m_pCurrent) % Alignment;
+	if(Offset)
+		Offset = Alignment - Offset;
+
 	// check if we need can fit the allocation
-	if(m_pCurrent->m_pCurrent + Size > m_pCurrent->m_pEnd)
+	if(m_pCurrent->m_pCurrent + Size + Offset > m_pCurrent->m_pEnd)
 		return (void *) 0x0;
 
 	// get memory and move the pointer forward
-	char *pMem = m_pCurrent->m_pCurrent;
-	m_pCurrent->m_pCurrent += Size;
+	char *pMem = m_pCurrent->m_pCurrent + Offset;
+	m_pCurrent->m_pCurrent += Size + Offset;
 	return pMem;
 }
 
@@ -69,17 +73,17 @@ void CHeap::Clear()
 }
 
 //
-void *CHeap::Allocate(unsigned int Size)
+void *CHeap::Allocate(unsigned int Size, unsigned int Alignment)
 {
 	// try to allocate from current chunk
-	char *pMem = (char *) AllocateFromChunk(Size);
+	char *pMem = (char *) AllocateFromChunk(Size, Alignment);
 	if(!pMem)
 	{
 		// allocate new chunk and add it to the heap
 		NewChunk();
 
 		// try to allocate again
-		pMem = (char *) AllocateFromChunk(Size);
+		pMem = (char *) AllocateFromChunk(Size, Alignment);
 	}
 
 	return pMem;
@@ -88,7 +92,7 @@ void *CHeap::Allocate(unsigned int Size)
 const char *CHeap::StoreString(const char *pSrc)
 {
 	const int Size = str_length(pSrc) + 1;
-	char *pMem = static_cast<char *>(Allocate(Size));
+	char *pMem = static_cast<char *>(Allocate(Size, alignof(char)));
 	str_copy(pMem, pSrc, Size);
 	return pMem;
 }