summaryrefslogtreecommitdiffstats
path: root/sesman/libscp/libscp_v1s.c
diff options
context:
space:
mode:
authorItamar Reis Peixoto <itamar@ispbrasil.com.br>2016-02-11 11:50:47 -0200
committerItamar Reis Peixoto <itamar@ispbrasil.com.br>2016-02-11 11:50:47 -0200
commit70920b836e7e64c34c55e31a2734a19e4a60c874 (patch)
tree30751f1423720bcb5e494b417f5749441811a767 /sesman/libscp/libscp_v1s.c
parent7e20d421cc46132d66ea66d5793e4e2af8fba6c0 (diff)
parenta91a285734b9c6916a5c01a1263b256d4671dcb6 (diff)
downloadxrdp-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_v1s.c')
-rw-r--r--sesman/libscp/libscp_v1s.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sesman/libscp/libscp_v1s.c b/sesman/libscp/libscp_v1s.c
index fb137433..ac370ad9 100644
--- a/sesman/libscp/libscp_v1s.c
+++ b/sesman/libscp/libscp_v1s.c
@@ -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);
scp_session_set_height(session, cmd);
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);
in_uint8(c->in_s, sz);
scp_session_set_rsr(session, sz);