diff options
author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2006-07-14 12:01:05 +0000 |
---|---|---|
committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2006-07-14 12:01:05 +0000 |
commit | 197d6a6cb0e8f48cdf7e3ce9bdda91f917e92686 (patch) | |
tree | 0eea94f66c1eb8b4ebc90bdafc236711c3b0056f | |
parent | 4ce8822169d176387a3f85af1b11c87ef07082e5 (diff) |
sys/ximage/gstximagesrc.c: Fix segfault when moving mouse pointer to the bottom right corner.
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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sys/ximage/gstximagesrc.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -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 = |