valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-4671 handle client's unexpected close.

Browse Source 
handle client's unexpected close. Avoid the server work thread falling into dead loop because :
1. the function return result from INT32 coverts to UINT32 ;
2. the condition in line 482 "ftype == T_STOP" will never be satisfied when the client socket closed before sending data to server.
This commit is contained in:
lixiasong 2018-11-23 09:17:57 +08:00 committed by James E. King III
parent 7af79c8359
commit 7abb7d5fbc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c
View File

@ -465,7 +465,7 @@ thrift_protocol_skip (ThriftProtocol *protocol, ThriftType type, GError **error)
}
case T_STRUCT:
{
guint32 result = 0;
gint32 result = 0;
gchar *name;
gint16 fid;
ThriftType ftype;
@ -475,6 +475,10 @@ thrift_protocol_skip (ThriftProtocol *protocol, ThriftType type, GError **error)
{
result += thrift_protocol_read_field_begin (protocol, &name, &ftype,
&fid, error);
if (result < 0)
{
return result;
}
if (ftype == T_STOP)
{
break;
@ -487,7 +491,7 @@ thrift_protocol_skip (ThriftProtocol *protocol, ThriftType type, GError **error)
}
case T_SET:
{
guint32 result = 0;
gint32 result = 0;
ThriftType elem_type;
guint32 i, size;
result += thrift_protocol_read_set_begin (protocol, &elem_type, &size,
@ -501,7 +505,7 @@ thrift_protocol_skip (ThriftProtocol *protocol, ThriftType type, GError **error)
}
case T_MAP:
{
guint32 result = 0;
gint32 result = 0;
ThriftType elem_type;
ThriftType key_type;
guint32 i, size;
@ -517,7 +521,7 @@ thrift_protocol_skip (ThriftProtocol *protocol, ThriftType type, GError **error)
}
case T_LIST:
{
guint32 result = 0;
gint32 result = 0;
ThriftType elem_type;
guint32 i, size;
result += thrift_protocol_read_list_begin (protocol, &elem_type, &size,