aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-10 06:02:42 +0000
committermarha <marha@users.sourceforge.net>2009-09-10 06:02:42 +0000
commit95c70bb7be5523ebd3b31b94c6ff046db44d76b4 (patch)
tree8dbbf0dd801ebc6d0b67e628fdb7fba9ba716417
parente978fab10babba27885fe6b8a3f8dd72fecbc792 (diff)
downloadvcxsrv-95c70bb7be5523ebd3b31b94c6ff046db44d76b4.tar.gz
vcxsrv-95c70bb7be5523ebd3b31b94c6ff046db44d76b4.tar.bz2
vcxsrv-95c70bb7be5523ebd3b31b94c6ff046db44d76b4.zip
Solved crash due to writing out of bits buffer in create_bits_picture.
xoff and yoff should be taken into acount for adjusting the bits pointer.
-rw-r--r--xorg-server/fb/fbpict.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c
index 2e56ab1ae..04ea68b3a 100644
--- a/xorg-server/fb/fbpict.c
+++ b/xorg-server/fb/fbpict.c
@@ -337,7 +337,7 @@ create_bits_picture (PicturePtr pict,
fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);
- bits = (FbBits*)((CARD8*)bits + drawable->y * stride * sizeof(FbBits) + drawable->x * (bpp / 8));
+ bits = (FbBits*)((CARD8*)bits + (yoff+drawable->y) * stride * sizeof(FbBits) + (xoff+drawable->x) * (bpp / 8));
image = pixman_image_create_bits (
pict->format, drawable->width, drawable->height,