summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sys/ximage/gstximagesrc.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f09c7bfa..6d29a3ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-14 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
+ * sys/ximage/gstximagesrc.c: (gst_ximage_src_ximage_get),
+ (gst_ximage_src_get_caps), (gst_ximage_src_class_init):
+ Fix segfault when moving mouse pointer to the bottom right corner.
+
2006-07-12 Wim Taymans <wim@fluendo.com>
* gst/rtp/Makefile.am:
diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 17c9d708..1a184fc6 100644
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -601,10 +601,8 @@ gst_ximage_src_ximage_get (GstXImageSrc * ximagesrc)
GUINT_TO_LE (ximagesrc->cursor_image->pixels[i]);
/* copy those pixels across */
- for (j = starty;
- j < starty + iheight && j - starty < ximagesrc->height; j++) {
- for (i = startx;
- i < startx + iwidth && i - startx < ximagesrc->width; i++) {
+ for (j = starty; j < starty + iheight && j < ximagesrc->height; j++) {
+ for (i = startx; i < startx + iwidth && i < ximagesrc->width; i++) {
guint8 *src, *dest;
src =