summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2012-05-21 08:43:01 -0700
committerJay Sorg <jay.sorg@gmail.com>2012-05-21 08:43:01 -0700
commit17d209985cb31e19d36700008f5b3f1c2bb67fcd (patch)
tree2ff4cafc41302d310667e0ac40a62f03d34a7e36 /xorg
parentd88291c9ddc4abc81ae68897faaafcc91f6a6e86 (diff)
downloadxrdp-proprietary-17d209985cb31e19d36700008f5b3f1c2bb67fcd.tar.gz
xrdp-proprietary-17d209985cb31e19d36700008f5b3f1c2bb67fcd.zip
xorg: check for if off screen bitmaps are off
Diffstat (limited to 'xorg')
-rw-r--r--xorg/X11R7.6/rdp/rdpup.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c
index 19a6e6d1..832c69e6 100644
--- a/xorg/X11R7.6/rdp/rdpup.c
+++ b/xorg/X11R7.6/rdp/rdpup.c
@@ -163,6 +163,10 @@ rdpup_add_os_bitmap(PixmapPtr pixmap, rdpPixmapPtr priv)
{
return -1;
}
+ if (g_os_bitmaps == 0)
+ {
+ return -1;
+ }
rv = -1;
index = 0;
while (index < g_max_os_bitmaps)
@@ -215,6 +219,10 @@ int
rdpup_remove_os_bitmap(int rdpindex)
{
LLOGLN(0, ("rdpup_remove_os_bitmap: index %d", rdpindex));
+ if (g_os_bitmaps == 0)
+ {
+ return 1;
+ }
if ((rdpindex < 0) && (rdpindex >= g_max_os_bitmaps))
{
return 1;