UNLOZE/sm-ext-dhooks2
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pointer returns being incorrectly set and freed.

Browse Source
This commit is contained in:
Dr!fter
2015-05-14 12:03:48 -04:00
parent 46af85d743
commit c04ce19b7c
3 changed files with 87 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vhook.h
+6 -13
View File
@@ -91,30 +91,23 @@ class HookReturnStruct
public:
~HookReturnStruct()
{
if(this->type != ReturnType_CharPtr && this->type != ReturnType_Vector && this->type != ReturnType_VectorPtr)
if(this->type == ReturnType_String || this->type == ReturnType_Int || this->type == ReturnType_Bool || this->type == ReturnType_Float || this->type == ReturnType_Vector)
{
free(this->newResult);
free(this->orgResult);
}
else if(this->isChanged)
{
if(this->type == ReturnType_CharPtr)
{
delete *(char **)this->newResult;
delete [] (char *)this->newResult;
}
else if(this->type == ReturnType_Vector || this->type == ReturnType_VectorPtr)
else if(this->type == ReturnType_VectorPtr)
{
delete *(Vector **)this->newResult;
delete (Vector *)this->newResult;
}
}
if(this->type == ReturnType_Vector || this->type == ReturnType_VectorPtr)
{
delete *(Vector **)this->orgResult;
}
else if(this->type != ReturnType_String && this->type != ReturnType_Int && this->type != ReturnType_Bool && this->type != ReturnType_Float)
{
free(*(void **)this->orgResult);
}
free(this->orgResult);
}
public:
ReturnType type;