summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspeidy <speidy@gmail.com>2016-05-18 00:23:07 -0400
committerspeidy <speidy@gmail.com>2016-05-18 00:23:07 -0400
commit881756a82ce50a26ed6e3b3c403d69cd81c8fea9 (patch)
tree736034395534a32928a9943d30b836bdcdd66d09
parent36c17767b7b40766f16db0e88dfbeaa9de77c565 (diff)
downloadxrdp-proprietary-881756a82ce50a26ed6e3b3c403d69cd81c8fea9.tar.gz
xrdp-proprietary-881756a82ce50a26ed6e3b3c403d69cd81c8fea9.zip
libxrdp: oops, fix virtual desktop size check
-rw-r--r--libxrdp/xrdp_sec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index fd8dfa36..9fcc7d13 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -1970,8 +1970,8 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
client_info->height = (y2 - y1) + 1;
}
/* make sure virtual desktop size is ok */
- if ((client_info->width > 0x7FFE && client_info->width < 0xC8) ||
- (client_info->height > 0x7FFE && client_info->height < 0xC8))
+ if ((client_info->width > 0x7FFE || client_info->width < 0xC8) ||
+ (client_info->height > 0x7FFE || client_info->height < 0xC8))
{
LLOGLN(0, ("[ERROR] xrdp_sec_process_mcs_data_monitors: error, virtual desktop width / height is too large"));
return 1; /* error */