server_common/wsproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复内存越界问题RemoveRequest

Browse Source
This commit is contained in:
aozhiwei 2020-05-06 10:15:34 +08:00
parent 3a30aed243
commit fe5b4a67ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/wsproxy/mastersvrmgr.cc
View File

@ -45,7 +45,6 @@ void MasterSvrMgr::_SS_MS_ResponseTargetServer(f8::MsgHdr& hdr, const ss::SS_MS_
{ {
f8::MsgHdr* context_hdr = GetHdrByContextId(msg.context_id()); f8::MsgHdr* context_hdr = GetHdrByContextId(msg.context_id());
if (context_hdr) { if (context_hdr) {
bool auto_free = true;
int socket_handle = context_hdr->socket_handle; int socket_handle = context_hdr->socket_handle;
if (msg.error_code() == 0) { if (msg.error_code() == 0) {
TargetConn* conn = TargetConnMgr::Instance()->RecreateTargetConn( TargetConn* conn = TargetConnMgr::Instance()->RecreateTargetConn(
@ -54,11 +53,12 @@ void MasterSvrMgr::_SS_MS_ResponseTargetServer(f8::MsgHdr& hdr, const ss::SS_MS_
); );
assert(conn); assert(conn);
if (conn) { if (conn) {
auto_free = false; RemoveRequest(socket_handle, msg.context_id(), false);
conn->ForwardClientMsgEx(context_hdr); conn->ForwardClientMsgEx(context_hdr);
return;
} }
} }
RemoveRequest(socket_handle, msg.context_id(), auto_free); RemoveRequest(socket_handle, msg.context_id(), true);
} }
} }