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

rail, text length checks

Browse Source
This commit is contained in:
Jay Sorg 2016-10-18 15:43:20 -07:00 committed by metalefty
parent 3c95a2aef2
commit fdb6195bbc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libxrdp/xrdp_orders_rail.c
View File

@ -264,6 +264,7 @@ xrdp_orders_send_window_new_update(struct xrdp_orders *self, int window_id,
/* titleInfo */ /* titleInfo */
num_chars = g_mbstowcs(0, window_state->title_info, 0); num_chars = g_mbstowcs(0, window_state->title_info, 0);
num_chars = MIN(num_chars, 2 * 1024); num_chars = MIN(num_chars, 2 * 1024);
num_chars = MAX(num_chars, 0);
order_size += 2 * num_chars + 2; order_size += 2 * num_chars + 2;
} }
@ -541,6 +542,7 @@ xrdp_orders_send_notify_new_update(struct xrdp_orders *self,
/* ToolTip (variable) UNICODE_STRING */ /* ToolTip (variable) UNICODE_STRING */
num_chars = g_mbstowcs(0, notify_state->tool_tip, 0); num_chars = g_mbstowcs(0, notify_state->tool_tip, 0);
num_chars = MIN(num_chars, 2 * 1024); num_chars = MIN(num_chars, 2 * 1024);
num_chars = MAX(num_chars, 0);
order_size += 2 * num_chars + 2; order_size += 2 * num_chars + 2;
} }
@ -550,10 +552,12 @@ xrdp_orders_send_notify_new_update(struct xrdp_orders *self,
/* UNICODE_STRING */ /* UNICODE_STRING */
num_chars = g_mbstowcs(0, notify_state->infotip.title, 0); num_chars = g_mbstowcs(0, notify_state->infotip.title, 0);
num_chars = MIN(num_chars, 2 * 1024); num_chars = MIN(num_chars, 2 * 1024);
num_chars = MAX(num_chars, 0);
order_size += 2 * num_chars + 2; order_size += 2 * num_chars + 2;
/* UNICODE_STRING */ /* UNICODE_STRING */
num_chars = g_mbstowcs(0, notify_state->infotip.text, 0); num_chars = g_mbstowcs(0, notify_state->infotip.text, 0);
num_chars = MIN(num_chars, 2 * 1024); num_chars = MIN(num_chars, 2 * 1024);
num_chars = MAX(num_chars, 0);
order_size += 2 * num_chars + 2; order_size += 2 * num_chars + 2;
/* Timeout (4 bytes) */ /* Timeout (4 bytes) */
/* InfoFlags (4 bytes) */ /* InfoFlags (4 bytes) */