diff options
| author | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2016-02-11 11:50:47 -0200 |
|---|---|---|
| committer | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2016-02-11 11:50:47 -0200 |
| commit | 70920b836e7e64c34c55e31a2734a19e4a60c874 (patch) | |
| tree | 30751f1423720bcb5e494b417f5749441811a767 /sesman/libscp/libscp_v0.c | |
| parent | 7e20d421cc46132d66ea66d5793e4e2af8fba6c0 (diff) | |
| parent | a91a285734b9c6916a5c01a1263b256d4671dcb6 (diff) | |
| download | xrdp-proprietary-70920b836e7e64c34c55e31a2734a19e4a60c874.tar.gz xrdp-proprietary-70920b836e7e64c34c55e31a2734a19e4a60c874.zip | |
Merge pull request #316 from proski/32bpp
Make it possible to use Xvnc with 32 bpp
Diffstat (limited to 'sesman/libscp/libscp_v0.c')
| -rw-r--r-- | sesman/libscp/libscp_v0.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sesman/libscp/libscp_v0.c b/sesman/libscp/libscp_v0.c index 8cf1340b..7fbdd2e8 100644 --- a/sesman/libscp/libscp_v0.c +++ b/sesman/libscp/libscp_v0.c @@ -252,7 +252,14 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) scp_session_set_height(session, sz); /* bpp */ 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)) { |