CSSZombieEscape/sm-ext-AsyncSocket
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reloading plugins causing a segfault with forwards

Browse Source
This commit is contained in:
Nikki 2015-05-21 16:55:08 -04:00
parent 1b93b4736c
commit a8fab5f749
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
context.cpp
View File

@ -2,6 +2,10 @@
AsyncSocketContext::AsyncSocketContext(IPluginContext* pContext) { AsyncSocketContext::AsyncSocketContext(IPluginContext* pContext) {
this->pContext = pContext; this->pContext = pContext;
connectCallback = forwards->CreateForwardEx(NULL, ET_Single, 1, NULL, Param_Cell);
errorCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_Cell, Param_String);
dataCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_String, Param_Cell);
} }
AsyncSocketContext::~AsyncSocketContext() { AsyncSocketContext::~AsyncSocketContext() {
@ -58,28 +62,13 @@ void AsyncSocketContext::OnData(char* data, ssize_t size) {
} }
bool AsyncSocketContext::SetConnectCallback(funcid_t function) { bool AsyncSocketContext::SetConnectCallback(funcid_t function) {
if (connectCallback) {
forwards->ReleaseForward(connectCallback);
}
connectCallback = forwards->CreateForwardEx(NULL, ET_Single, 1, NULL, Param_Cell);
return connectCallback->AddFunction(pContext, function); return connectCallback->AddFunction(pContext, function);
} }
bool AsyncSocketContext::SetErrorCallback(funcid_t function) { bool AsyncSocketContext::SetErrorCallback(funcid_t function) {
if (connectCallback) {
forwards->ReleaseForward(errorCallback);
}
errorCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_Cell, Param_String);
return errorCallback->AddFunction(pContext, function); return errorCallback->AddFunction(pContext, function);
} }
bool AsyncSocketContext::SetDataCallback(funcid_t function) { bool AsyncSocketContext::SetDataCallback(funcid_t function) {
if (dataCallback) {
forwards->ReleaseForward(dataCallback);
}
dataCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_String, Param_Cell);
return dataCallback->AddFunction(pContext, function); return dataCallback->AddFunction(pContext, function);
} }

2
extension.cpp
View File

@ -72,7 +72,7 @@ AsyncSocketContext* AsyncSocket::GetSocketInstanceByHandle(Handle_t handle) {
void AsyncSocket::OnHandleDestroy(HandleType_t type, void *object) { void AsyncSocket::OnHandleDestroy(HandleType_t type, void *object) {
if(object != NULL) { if(object != NULL) {
AsyncSocketContext *ctx = (AsyncSocketContext *) object; AsyncSocketContext *ctx = (AsyncSocketContext *) object;
UV_EOF;
delete ctx; delete ctx;
} }
} }