sys/ximage/gstximagesrc.c: Fix segfault when moving mouse pointer to the bottom right...

Original commit message from CVS:
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.

diff --git a/ChangeLog b/ChangeLog
index f09c7bf..6d29a3b 100644 (file)
--- 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 17c9d70..1a184fc 100644 (file)
--- 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 =