diff options
| author | speidy <speidy@gmail.com> | 2017-02-09 12:00:25 +0200 |
|---|---|---|
| committer | metalefty <meta@vmeta.jp> | 2017-03-24 15:36:36 +0900 |
| commit | dfd639a3a9e5f2f84dd0694ca54a14a4258fd671 (patch) | |
| tree | 8094b82e1163aac2e25d56f605d79f2a370b5b53 /libxrdp | |
| parent | fdb6195bbc22e27348732192b3af79e210a8f4d1 (diff) | |
| download | xrdp-proprietary-dfd639a3a9e5f2f84dd0694ca54a14a4258fd671.tar.gz xrdp-proprietary-dfd639a3a9e5f2f84dd0694ca54a14a4258fd671.zip | |
RAIL: use fixed size length for window texts
Diffstat (limited to 'libxrdp')
| -rw-r--r-- | libxrdp/xrdp_orders_rail.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libxrdp/xrdp_orders_rail.c b/libxrdp/xrdp_orders_rail.c index a07bb2e8..be35789b 100644 --- a/libxrdp/xrdp_orders_rail.c +++ b/libxrdp/xrdp_orders_rail.c @@ -195,14 +195,17 @@ xrdp_orders_send_as_unicode(struct stream *s, const char *text) int str_chars; int index; int i32; + int len; twchar *wdst; - wdst = (twchar *) g_malloc(sizeof(twchar) * 64 * 1024, 1); + len = g_strlen(text) + 1; + + wdst = (twchar *) g_malloc(sizeof(twchar) * len, 1); if (wdst == 0) { return 1; } - str_chars = g_mbstowcs(wdst, text, 2 * 1024); + str_chars = g_mbstowcs(wdst, text, sizeof(twchar) * len); if (str_chars > 0) { i32 = str_chars * 2; @@ -263,7 +266,7 @@ xrdp_orders_send_window_new_update(struct xrdp_orders *self, int window_id, { /* titleInfo */ num_chars = g_mbstowcs(0, window_state->title_info, 0); - num_chars = MIN(num_chars, 2 * 1024); + num_chars = MIN(num_chars, sizeof(twchar) * (g_strlen(window_state->title_info) + 1)); num_chars = MAX(num_chars, 0); order_size += 2 * num_chars + 2; } @@ -541,7 +544,7 @@ xrdp_orders_send_notify_new_update(struct xrdp_orders *self, { /* ToolTip (variable) UNICODE_STRING */ num_chars = g_mbstowcs(0, notify_state->tool_tip, 0); - num_chars = MIN(num_chars, 2 * 1024); + num_chars = MIN(num_chars, sizeof(twchar) * (g_strlen(notify_state->tool_tip) + 1)); num_chars = MAX(num_chars, 0); order_size += 2 * num_chars + 2; } @@ -551,12 +554,12 @@ xrdp_orders_send_notify_new_update(struct xrdp_orders *self, /* InfoTip (variable) TS_NOTIFY_ICON_INFOTIP */ /* UNICODE_STRING */ num_chars = g_mbstowcs(0, notify_state->infotip.title, 0); - num_chars = MIN(num_chars, 2 * 1024); + num_chars = MIN(num_chars, sizeof(twchar) * (g_strlen(notify_state->infotip.title) + 1)); num_chars = MAX(num_chars, 0); order_size += 2 * num_chars + 2; /* UNICODE_STRING */ num_chars = g_mbstowcs(0, notify_state->infotip.text, 0); - num_chars = MIN(num_chars, 2 * 1024); + num_chars = MIN(num_chars, sizeof(twchar) * (g_strlen(notify_state->infotip.text) + 1)); num_chars = MAX(num_chars, 0); order_size += 2 * num_chars + 2; /* Timeout (4 bytes) */ |