Blame 0001-XV-Fix-segfault-under-certain-conditions.patch
|
|
3871b59 |
From c69289c5c11e7a65d99db91e8ee38c0e58212c51 Mon Sep 17 00:00:00 2001
|
|
|
3871b59 |
From: "Bernhard M. Wiedemann" <bernhardout2@lsmod.de>
|
|
|
3871b59 |
Date: Sat, 27 Dec 2014 14:42:24 +0100
|
|
|
3871b59 |
Subject: [PATCH xawtv3 1/9] XV: Fix segfault under certain conditions
|
|
|
3871b59 |
|
|
|
3871b59 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
3871b59 |
---
|
|
|
3871b59 |
x11/blit.c | 3 ++-
|
|
|
3871b59 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
3871b59 |
|
|
|
3871b59 |
diff --git a/x11/blit.c b/x11/blit.c
|
|
|
3871b59 |
index 0ac88b8..7b1de1b 100644
|
|
|
3871b59 |
--- a/x11/blit.c
|
|
|
3871b59 |
+++ b/x11/blit.c
|
|
|
3871b59 |
@@ -937,7 +937,8 @@ void blit_putframe(struct blit_state *st, struct ng_video_buf *buf)
|
|
|
3871b59 |
|
|
|
3871b59 |
#ifdef HAVE_LIBXV
|
|
|
3871b59 |
case STATUS_XVIDEO:
|
|
|
3871b59 |
- memcpy(st->xvimage->data,buf->data,buf->size);
|
|
|
3871b59 |
+ memcpy(st->xvimage->data,buf->data,
|
|
|
3871b59 |
+ buf->size < st->xvimage->data_size ? buf->size : st->xvimage->data_size);
|
|
|
3871b59 |
ng_release_video_buf(buf);
|
|
|
3871b59 |
xv_blit(XtDisplay(st->widget), XtWindow(st->widget),
|
|
|
3871b59 |
st->gc, st->xvimage,
|
|
|
3871b59 |
--
|
|
|
3871b59 |
2.7.1
|
|
|
3871b59 |
|