gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fixes use of invalid pointer from temporary string (caused some invalid read warnings in Valgrind)

Browse Source 
This was SVN commit r13237.
This commit is contained in:
historic_bruno
2013-03-07 03:54:41 +00:00
parent ff97d550b8
commit f5be596ee8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/TerrainTextureEntry.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games.
/* Copyright (C) 2013 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -203,8 +203,8 @@ const float* CTerrainTextureEntry::GetTextureMatrix()
// calculate the coordinate of each alphamap within this packed texture
void CTerrainTextureEntry::LoadAlphaMaps(VfsPath &amtype)
{
const wchar_t* const key = (L"(alpha map composite" + amtype.string() + L")").c_str();
std::wstring key = L"(alpha map composite" + amtype.string() + L")";
CTerrainTextureManager::TerrainAlphaMap::iterator it = g_TexMan.m_TerrainAlphas.find(amtype);
if (it != g_TexMan.m_TerrainAlphas.end())