mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix warnings

This commit is contained in:
Jay Sorg 2016-04-09 22:10:12 -07:00
parent dbf6bcc8be
commit 87208db090
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libxrdp/xrdp_caps.c
View File

@ -550,6 +550,11 @@ xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s)
in_uint16_le(s, num_caps); in_uint16_le(s, num_caps);
in_uint8s(s, 2); /* pad */ in_uint8s(s, 2); /* pad */
if ((cap_len < 0) || (cap_len > 1024 * 1024))
{
return 1;
}
for (index = 0; index < num_caps; index++) for (index = 0; index < num_caps; index++)
{ {
p = s->p; p = s->p;

7
libxrdp/xrdp_iso.c
View File

@ -355,11 +355,18 @@ xrdp_iso_incoming(struct xrdp_iso *self)
{ {
text[cookie_index] = cc_type; text[cookie_index] = cc_type;
cookie_index++; cookie_index++;
if (cookie_index > 255)
{
cookie_index = 255;
}
if ((s->p[0] == 0x0D) && (s->p[1] == 0x0A)) if ((s->p[0] == 0x0D) && (s->p[1] == 0x0A))
{ {
in_uint8s(s, 2); in_uint8s(s, 2);
text[cookie_index] = 0; text[cookie_index] = 0;
cookie_index = 0; cookie_index = 0;
if (g_strlen(text) > 0)
{
}
break; break;
} }
in_uint8(s, cc_type); in_uint8(s, cc_type);

18
libxrdp/xrdp_orders.c
View File

@ -2641,6 +2641,7 @@ height(%d)", lines_sending, height);
return 0; return 0;
} }
#if defined(XRDP_JPEG)
/*****************************************************************************/ /*****************************************************************************/
static int static int
xrdp_orders_send_as_jpeg(struct xrdp_orders *self, xrdp_orders_send_as_jpeg(struct xrdp_orders *self,
@ -2663,6 +2664,7 @@ xrdp_orders_send_as_jpeg(struct xrdp_orders *self,
return 1; return 1;
} }
#endif
#if defined(XRDP_NEUTRINORDP) #if defined(XRDP_NEUTRINORDP)
/*****************************************************************************/ /*****************************************************************************/
@ -2693,6 +2695,7 @@ xrdp_orders_send_as_rfx(struct xrdp_orders *self,
} }
#endif #endif
#if defined(XRDP_JPEG) || defined(XRDP_NEUTRINORDP)
/*****************************************************************************/ /*****************************************************************************/
static int APP_CC static int APP_CC
xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx, xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx,
@ -2733,6 +2736,7 @@ xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx,
out_uint8a(self->out_s, buf, bufsize); out_uint8a(self->out_s, buf, bufsize);
return 0; return 0;
} }
#endif
/*****************************************************************************/ /*****************************************************************************/
/* secondary drawing order (bitmap v3) using remotefx compression */ /* secondary drawing order (bitmap v3) using remotefx compression */
@ -2741,12 +2745,16 @@ xrdp_orders_send_bitmap3(struct xrdp_orders *self,
int width, int height, int bpp, char *data, int width, int height, int bpp, char *data,
int cache_id, int cache_idx, int hints) int cache_id, int cache_idx, int hints)
{ {
int e;
int bufsize;
int quality;
struct stream *xr_s; /* xrdp stream */
struct stream *temp_s; /* xrdp stream */
struct xrdp_client_info *ci; struct xrdp_client_info *ci;
#if defined(XRDP_JPEG) || defined(XRDP_NEUTRINORDP)
int bufsize;
struct stream *xr_s; /* xrdp stream */
#endif
#if defined(XRDP_JPEG)
int e;
int quality;
struct stream *temp_s; /* xrdp stream */
#endif
#if defined(XRDP_NEUTRINORDP) #if defined(XRDP_NEUTRINORDP)
STREAM *fr_s; /* FreeRDP stream */ STREAM *fr_s; /* FreeRDP stream */
RFX_CONTEXT *context; RFX_CONTEXT *context;