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

Check return value of scp_session_set_bpp()

Browse Source
This commit is contained in:
Pavel Roskin 2016-02-10 01:14:40 -08:00
parent 7e20d421cc
commit 5d23d007e9
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sesman/libscp/libscp_v0.c
View File

@ -252,7 +252,14 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk)
scp_session_set_height(session, sz); scp_session_set_height(session, sz);
/* bpp */ /* bpp */
in_uint16_be(c->in_s, sz); in_uint16_be(c->in_s, sz);
scp_session_set_bpp(session, (tui8)sz); if (0 != scp_session_set_bpp(session, (tui8)sz))
{
scp_session_destroy(session);
log_message(LOG_LEVEL_WARNING,
"[v0:%d] connection aborted: unsupported bpp: %d",
__LINE__, (tui8)sz);
return SCP_SERVER_STATE_INTERNAL_ERR;
}
if (s_check_rem(c->in_s, 2)) if (s_check_rem(c->in_s, 2))
{ {

8
sesman/libscp/libscp_v1s.c
View File

@ -131,6 +131,14 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION *c, struct SCP_SES
in_uint16_be(c->in_s, cmd); in_uint16_be(c->in_s, cmd);
scp_session_set_height(session, cmd); scp_session_set_height(session, cmd);
in_uint8(c->in_s, sz); in_uint8(c->in_s, sz);
if (0 != scp_session_set_bpp(session, sz))
{
scp_session_destroy(session);
log_message(LOG_LEVEL_WARNING,
"[v1s:%d] connection aborted: unsupported bpp: %d",
__LINE__, sz);
return SCP_SERVER_STATE_INTERNAL_ERR;
}
scp_session_set_bpp(session, sz); scp_session_set_bpp(session, sz);
in_uint8(c->in_s, sz); in_uint8(c->in_s, sz);
scp_session_set_rsr(session, sz); scp_session_set_rsr(session, sz);