summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2006-06-29 11:05:14 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2006-06-29 11:05:14 +0000
commit1614e03cdb756e35b75b86c41397407558ed5fdf (patch)
tree3a0272a881733f40cd3e66254a106d81d3c3d06d
parent2657a246ea9e3fd8092c7800c260239c92b55f41 (diff)
sys/ximage/gstximagesrc.c: Fix hypothetical crash.
Original commit message from CVS: 2006-06-29 Zaheer Abbas Merali <zaheerabbas at merali dot org> * sys/ximage/gstximagesrc.c: (gst_ximage_src_ximage_get): Fix hypothetical crash.
-rw-r--r--ChangeLog6
-rw-r--r--sys/ximage/gstximagesrc.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dfd1442..37c752d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-29 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
+ * sys/ximage/gstximagesrc.c: (gst_ximage_src_ximage_get):
+
+ Fix hypothetical crash.
+
2006-06-28 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Brian Cameron <brian dot cameron at sun dot com>
diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 55e1834d..e8ac7293 100644
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -479,7 +479,11 @@ gst_ximage_src_ximage_get (GstXImageSrc * ximagesrc)
int cx, cy, i, j, count;
cx = ximagesrc->cursor_image->x - ximagesrc->cursor_image->xhot;
+ if (cx < 0)
+ cx = 0;
cy = ximagesrc->cursor_image->y - ximagesrc->cursor_image->yhot;
+ if (cy < 0)
+ cy = 0;
count = ximagesrc->cursor_image->width * ximagesrc->cursor_image->height;
for (i = 0; i < count; i++)
ximagesrc->cursor_image->pixels[i] =