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

fix for case where shmget can return an shmid of zero

Browse Source
This commit is contained in:
Jay Sorg 2015-02-09 19:26:04 -08:00
parent ef20d9d507
commit 9cd634007f
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xup/xup.c
View File

@ -1135,7 +1135,7 @@ process_server_paint_rect_shmem(struct mod *mod, struct stream *s)
if (flags == 0) /* screen */ if (flags == 0) /* screen */
{ {
if (mod->screen_shmem_id == 0) if (mod->screen_shmem_id_mapped == 0)
{ {
mod->screen_shmem_id = shmem_id; mod->screen_shmem_id = shmem_id;
mod->screen_shmem_pixels = g_shmat(mod->screen_shmem_id); mod->screen_shmem_pixels = g_shmat(mod->screen_shmem_id);
@ -1144,6 +1144,11 @@ process_server_paint_rect_shmem(struct mod *mod, struct stream *s)
/* failed */ /* failed */
mod->screen_shmem_id = 0; mod->screen_shmem_id = 0;
mod->screen_shmem_pixels = 0; mod->screen_shmem_pixels = 0;
mod->screen_shmem_id_mapped = 0;
}
else
{
mod->screen_shmem_id_mapped = 1;
} }
} }
if (mod->screen_shmem_pixels != 0) if (mod->screen_shmem_pixels != 0)
@ -1246,10 +1251,21 @@ process_server_paint_rect_shmem_ex(struct mod *amod, struct stream *s)
bmpdata = 0; bmpdata = 0;
if (flags == 0) /* screen */ if (flags == 0) /* screen */
{ {
if (amod->screen_shmem_id == 0) if (amod->screen_shmem_id_mapped == 0)
{ {
amod->screen_shmem_id = shmem_id; amod->screen_shmem_id = shmem_id;
amod->screen_shmem_pixels = g_shmat(amod->screen_shmem_id); amod->screen_shmem_pixels = g_shmat(amod->screen_shmem_id);
if (amod->screen_shmem_pixels == (void*)-1)
{
/* failed */
amod->screen_shmem_id = 0;
amod->screen_shmem_pixels = 0;
amod->screen_shmem_id_mapped = 0;
}
else
{
amod->screen_shmem_id_mapped = 1;
}
} }
if (amod->screen_shmem_pixels != 0) if (amod->screen_shmem_pixels != 0)
{ {

1
xup/xup.h
View File

@ -160,5 +160,6 @@ struct mod
int shift_state; int shift_state;
struct xrdp_client_info client_info; struct xrdp_client_info client_info;
int screen_shmem_id; int screen_shmem_id;
int screen_shmem_id_mapped; /* boolean */
char *screen_shmem_pixels; char *screen_shmem_pixels;
}; };