jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed CVE-2020-4044 CI errors

Browse Source
This commit is contained in:
matt335672 2020-06-29 11:22:13 +01:00
parent 0c791d073d
commit 7384f6e574
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sesman/libscp/libscp_v0.c
View File

@ -99,7 +99,7 @@ enum SCP_CLIENT_STATES_E
scp_v0c_connect(struct SCP_CONNECTION *c, struct SCP_SESSION *s) scp_v0c_connect(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
{ {
tui32 version; tui32 version;
tui32 size; int size;
tui16 sz; tui16 sz;
init_stream(c->in_s, c->in_s->size); init_stream(c->in_s, c->in_s->size);
@ -187,8 +187,8 @@ scp_v0c_connect(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
if (size < (8 + 2 + 2 + 2) || size > SCP_MAX_MESSAGE_SIZE) if (size < (8 + 2 + 2 + 2) || size > SCP_MAX_MESSAGE_SIZE)
{ {
log_message(LOG_LEVEL_WARNING, log_message(LOG_LEVEL_WARNING,
"[v0:%d] connection aborted: msg size = %u", "[v0:%d] connection aborted: msg size = %d",
__LINE__, (unsigned int)size); __LINE__, size);
return SCP_CLIENT_STATE_SIZE_ERR; return SCP_CLIENT_STATE_SIZE_ERR;
} }
@ -240,7 +240,7 @@ scp_v0c_connect(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
static enum SCP_SERVER_STATES_E static enum SCP_SERVER_STATES_E
scp_v0s_init_session(struct SCP_CONNECTION *c, struct SCP_SESSION *session) scp_v0s_init_session(struct SCP_CONNECTION *c, struct SCP_SESSION *session)
{ {
tui32 size; int size;
tui16 height; tui16 height;
tui16 width; tui16 width;
tui16 bpp; tui16 bpp;
@ -254,8 +254,8 @@ scp_v0s_init_session(struct SCP_CONNECTION *c, struct SCP_SESSION *session)
if (size < (8 + 2) || size > SCP_MAX_MESSAGE_SIZE) if (size < (8 + 2) || size > SCP_MAX_MESSAGE_SIZE)
{ {
log_message(LOG_LEVEL_WARNING, log_message(LOG_LEVEL_WARNING,
"[v0:%d] connection aborted: msg size = %u", "[v0:%d] connection aborted: msg size = %d",
__LINE__, (unsigned int)size); __LINE__, size);
return SCP_SERVER_STATE_SIZE_ERR; return SCP_SERVER_STATE_SIZE_ERR;
} }

6
sesman/libscp/libscp_v1s.c
View File

@ -218,7 +218,7 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION *c, struct SCP_SES
enum SCP_SERVER_STATES_E result; enum SCP_SERVER_STATES_E result;
struct SCP_SESSION *session; struct SCP_SESSION *session;
tui32 version; tui32 version;
tui32 size; int size;
tui16 cmdset; tui16 cmdset;
tui16 cmd; tui16 cmd;
@ -354,7 +354,7 @@ scp_v1s_request_password(struct SCP_CONNECTION *c, struct SCP_SESSION *s,
const char *reason) const char *reason)
{ {
tui32 version; tui32 version;
tui32 size; int size;
tui16 cmdset; tui16 cmdset;
tui16 cmd; tui16 cmd;
int rlen; int rlen;
@ -539,7 +539,7 @@ enum SCP_SERVER_STATES_E
scp_v1s_list_sessions(struct SCP_CONNECTION *c, int sescnt, struct SCP_DISCONNECTED_SESSION *ds, SCP_SID *sid) scp_v1s_list_sessions(struct SCP_CONNECTION *c, int sescnt, struct SCP_DISCONNECTED_SESSION *ds, SCP_SID *sid)
{ {
tui32 version = 1; tui32 version = 1;
tui32 size = 12; int size = 12;
tui16 cmd = 40; tui16 cmd = 40;
int pktcnt; int pktcnt;
int idx; int idx;

2
sesman/libscp/libscp_v1s_mng.c
View File

@ -381,7 +381,7 @@ static enum SCP_SERVER_STATES_E
_scp_v1s_mng_check_response(struct SCP_CONNECTION *c, struct SCP_SESSION *s) _scp_v1s_mng_check_response(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
{ {
tui32 version; tui32 version;
tui32 size; int size;
tui16 cmd; tui16 cmd;
// tui8 dim; // tui8 dim;
// char buf[257]; // char buf[257];