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

Fix several cases of discarding return values

Browse Source
This commit is contained in:
Pavel Roskin 2017-01-22 10:46:23 -08:00 committed by jsorg71
parent 9f66ddfc33
commit 0bb048d35e
2 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libxrdp/libxrdp.c
View File

@ -275,6 +275,7 @@ libxrdp_process_data(struct xrdp_session *session, struct stream *s)
int EXPORT_CC int EXPORT_CC
libxrdp_send_palette(struct xrdp_session *session, int *palette) libxrdp_send_palette(struct xrdp_session *session, int *palette)
{ {
int rv;
int i = 0; int i = 0;
int color = 0; int color = 0;
struct stream *s = (struct stream *)NULL; struct stream *s = (struct stream *)NULL;
@ -337,10 +338,16 @@ libxrdp_send_palette(struct xrdp_session *session, int *palette)
free_stream(s); free_stream(s);
/* send the orders palette too */ /* send the orders palette too */
libxrdp_orders_init(session); rv = libxrdp_orders_init(session);
libxrdp_orders_send_palette(session, palette, 0); if (rv == 0)
libxrdp_orders_send(session); {
return 0; rv = libxrdp_orders_send_palette(session, palette, 0);
}
if (rv == 0)
{
rv = libxrdp_orders_send(session);
}
return rv;
} }
/******************************************************************************/ /******************************************************************************/

30
xrdp/xrdp_mm.c
View File

@ -823,8 +823,14 @@ xrdp_mm_process_rail_create_window(struct xrdp_mm* self, struct stream* s)
} }
in_uint32_le(s, flags); in_uint32_le(s, flags);
rv = libxrdp_orders_init(self->wm->session); rv = libxrdp_orders_init(self->wm->session);
if (rv == 0)
{
rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags); rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags);
}
if (rv == 0)
{
rv = libxrdp_orders_send(self->wm->session); rv = libxrdp_orders_send(self->wm->session);
}
g_free(rwso.title_info); g_free(rwso.title_info);
g_free(rwso.window_rects); g_free(rwso.window_rects);
g_free(rwso.visibility_rects); g_free(rwso.visibility_rects);
@ -892,8 +898,14 @@ xrdp_mm_process_rail_configure_window(struct xrdp_mm* self, struct stream* s)
} }
in_uint32_le(s, flags); in_uint32_le(s, flags);
rv = libxrdp_orders_init(self->wm->session); rv = libxrdp_orders_init(self->wm->session);
if (rv == 0)
{
rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags); rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags);
}
if (rv == 0)
{
rv = libxrdp_orders_send(self->wm->session); rv = libxrdp_orders_send(self->wm->session);
}
g_free(rwso.window_rects); g_free(rwso.window_rects);
g_free(rwso.visibility_rects); g_free(rwso.visibility_rects);
return rv; return rv;
@ -912,8 +924,14 @@ xrdp_mm_process_rail_destroy_window(struct xrdp_mm* self, struct stream* s)
in_uint32_le(s, window_id); in_uint32_le(s, window_id);
g_writeln("xrdp_mm_process_rail_destroy_window 0x%8.8x", window_id); g_writeln("xrdp_mm_process_rail_destroy_window 0x%8.8x", window_id);
rv = libxrdp_orders_init(self->wm->session); rv = libxrdp_orders_init(self->wm->session);
if (rv == 0)
{
rv = libxrdp_window_delete(self->wm->session, window_id); rv = libxrdp_window_delete(self->wm->session, window_id);
}
if (rv == 0)
{
rv = libxrdp_orders_send(self->wm->session); rv = libxrdp_orders_send(self->wm->session);
}
return rv; return rv;
} }
@ -935,8 +953,14 @@ xrdp_mm_process_rail_show_window(struct xrdp_mm* self, struct stream* s)
g_writeln("xrdp_mm_process_rail_show_window 0x%8.8x %x", window_id, g_writeln("xrdp_mm_process_rail_show_window 0x%8.8x %x", window_id,
rwso.show_state); rwso.show_state);
rv = libxrdp_orders_init(self->wm->session); rv = libxrdp_orders_init(self->wm->session);
if (rv == 0)
{
rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags); rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags);
}
if (rv == 0)
{
rv = libxrdp_orders_send(self->wm->session); rv = libxrdp_orders_send(self->wm->session);
}
return rv; return rv;
} }
@ -965,8 +989,14 @@ xrdp_mm_process_rail_update_window_text(struct xrdp_mm* self, struct stream* s)
rwso.title_info[size] = 0; rwso.title_info[size] = 0;
g_writeln(" set window title %s size %d 0x%8.8x", rwso.title_info, size, flags); g_writeln(" set window title %s size %d 0x%8.8x", rwso.title_info, size, flags);
rv = libxrdp_orders_init(self->wm->session); rv = libxrdp_orders_init(self->wm->session);
if (rv == 0)
{
rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags); rv = libxrdp_window_new_update(self->wm->session, window_id, &rwso, flags);
}
if (rv == 0)
{
rv = libxrdp_orders_send(self->wm->session); rv = libxrdp_orders_send(self->wm->session);
}
g_writeln(" set window title %s %d", rwso.title_info, rv); g_writeln(" set window title %s %d", rwso.title_info, rv);
g_free(rwso.title_info); g_free(rwso.title_info);