From 197d6a6cb0e8f48cdf7e3ce9bdda91f917e92686 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Fri, 14 Jul 2006 12:01:05 +0000 Subject: [PATCH] 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 * 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. --- ChangeLog | 6 ++++++ sys/ximage/gstximagesrc.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f09c7bfa23..6d29a3ba91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-14 Zaheer Abbas Merali + + * 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 * gst/rtp/Makefile.am: diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c index 17c9d708f4..1a184fc60a 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 =