pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix va_list leaks in MakeAnyLenString/AppendAnyLenString (#1240)

Browse Source 
Slowly leaking memory for ages!

clang-tidy complained about it
This commit is contained in:
Michael Cook (mackal) 2021-02-12 03:07:47 -05:00 committed by GitHub
parent 6e765e7ddc
commit f9923ffda0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/string_util.cpp
View File

@ -356,6 +356,7 @@ int MakeAnyLenString(char** ret, const char* format, ...) {
*ret = new char[buf_len]; *ret = new char[buf_len];
va_copy(tmpargptr, argptr); va_copy(tmpargptr, argptr);
chars = vsnprintf(*ret, buf_len, format, tmpargptr); chars = vsnprintf(*ret, buf_len, format, tmpargptr);
va_end(tmpargptr);
} }
va_end(argptr); va_end(argptr);
return chars; return chars;
@ -384,6 +385,7 @@ uint32 AppendAnyLenString(char** ret, uint32* bufsize, uint32* strlen, const cha
} }
va_copy(tmpargptr, argptr); va_copy(tmpargptr, argptr);
chars = vsnprintf(&(*ret)[*strlen], (*bufsize - *strlen), format, tmpargptr); chars = vsnprintf(&(*ret)[*strlen], (*bufsize - *strlen), format, tmpargptr);
va_end(tmpargptr);
} }
va_end(argptr); va_end(argptr);
*strlen += chars; *strlen += chars;