mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-27 01:44:23 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for memory leak

Browse Source
This commit is contained in:
SoftCoder
2013-12-16 17:48:52 -08:00
parent d1f9fbc4a7
commit 1463dc0fc1
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@@ -2435,21 +2435,31 @@ string getUserHome() {
} }
string safeCharPtrCopy(const char *ptr,int maxLength) { string safeCharPtrCopy(const char *ptr,int maxLength) {
string result = "";
if(ptr == NULL) { if(ptr == NULL) {
return ""; return result;
} }
if(maxLength <= 0) { if(maxLength <= 0) {
maxLength = 8096; maxLength = 8096;
} }
char *pBuffer = new char[maxLength+1]; int ptrLength = (int)strlen(ptr);
memset(pBuffer,0,maxLength+1); if(ptrLength >= maxLength) {
char *pBuffer = new char[maxLength+1];
memset(pBuffer,0,maxLength+1);
#ifdef WIN32 #ifdef WIN32
memcpy(pBuffer,ptr,min((int)strlen(ptr),maxLength)); memcpy(pBuffer,ptr,min((int)strlen(ptr),maxLength));
#else #else
memcpy(pBuffer,ptr,std::min((int)strlen(ptr),maxLength)); memcpy(pBuffer,ptr,std::min((int)strlen(ptr),maxLength));
#endif #endif
return pBuffer;
result = pBuffer;
delete [] pBuffer;
}
else {
result = ptr;
}
return result;
} }