From 45491151657b832b012e1221fa29cb28ae7fdbf0 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 23 Apr 2004 08:38:48 +0000 Subject: [PATCH] fixed memory leaks from bug 935801 (these were from original vexd) --- dlls/engine/meta_api.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/engine/meta_api.cpp b/dlls/engine/meta_api.cpp index 8a925ec8..5c1906f3 100755 --- a/dlls/engine/meta_api.cpp +++ b/dlls/engine/meta_api.cpp @@ -116,6 +116,19 @@ int AMX_MAKE_STRING(AMX *oPlugin, cell tParam, int &iLength) { return MAKE_STRING(szCopyValue); } +// Makes a char pointer out of an AMX cell. +//Note that this does not deallocate and should only be used +// with hl engfuncs that store the pointers for secret eating +char *AMX_GET_STRING(AMX *oPlugin, cell tParam, int &iLength) { + char *szNewValue = GET_AMXSTRING(oPlugin, tParam, 0, iLength); + + char* szCopyValue = new char[iLength + 1]; + strncpy(szCopyValue , szNewValue, iLength); + *(szCopyValue + iLength) = '\0'; + + return szCopyValue; +} + /******************************************************** exported functions ******************************************************/ @@ -1966,8 +1979,8 @@ static cell AMX_NATIVE_CALL DispatchKeyValue(AMX *amx, cell *params) { edict_t* pTarget = INDEXENT(params[1]); int iKeyLength; int iValueLength; - char *szKey = GET_AMXSTRING(amx, params[2], 0, iKeyLength); - char *szValue = GET_AMXSTRING(amx, params[3], 1, iValueLength); + char *szKey = AMX_GET_STRING(amx, params[2], iKeyLength); + char *szValue = AMX_GET_STRING(amx, params[3], iValueLength); if(FNullEnt(pTarget)) { @@ -2036,7 +2049,7 @@ static cell AMX_NATIVE_CALL entity_set_model(AMX *amx, cell *params) { edict_t* pTarget = INDEXENT(params[1]); int iLength; - char *szNewValue = GET_AMXSTRING(amx, params[2], 0, iLength); + char *szNewValue = AMX_GET_STRING(amx, params[2], iLength); if(FNullEnt(pTarget)) { return 0;