[libucil/f14/master] fixes for #627695, #627890 and #632439
Kamil Dudka
kdudka at fedoraproject.org
Wed Sep 15 12:22:09 UTC 2010
commit 9d0e48e36381b42162eb504665c71ecddcc0b4cf
Author: Kamil Dudka <kdudka at redhat.com>
Date: Wed Sep 15 14:07:57 2010 +0200
fixes for #627695, #627890 and #632439
libucil-0.9.8-bz627890.patch | 17 +++++++++++++++++
libucil-0.9.8-bz632439.patch | 13 +++++++++++++
libucil.spec | 14 +++++++++++++-
3 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/libucil-0.9.8-bz627890.patch b/libucil-0.9.8-bz627890.patch
new file mode 100644
index 0000000..f3e2853
--- /dev/null
+++ b/libucil-0.9.8-bz627890.patch
@@ -0,0 +1,17 @@
+diff --git a/src/ucil_theora.c b/src/ucil_theora.c
+index 0919a97..e2d00ef 100644
+--- a/src/ucil_theora.c
++++ b/src/ucil_theora.c
+@@ -1556,7 +1556,11 @@ ucil_theora_video_file_object_t *ucil_theora_create_video_filev( const char *pat
+
+ #endif
+
+- theora_encode_init( &vobj->th, &vobj->ti );
++ if( theora_encode_init( &vobj->th, &vobj->ti ) != 0)
++ {
++ free( vobj );
++ return NULL;
++ }
+
+ vobj->full_queue = g_queue_new();
+ vobj->empty_queue = g_queue_new();
diff --git a/libucil-0.9.8-bz632439.patch b/libucil-0.9.8-bz632439.patch
new file mode 100644
index 0000000..b51434e
--- /dev/null
+++ b/libucil-0.9.8-bz632439.patch
@@ -0,0 +1,13 @@
+=== modified file 'libucil/src/ucil_rawavi.c'
+--- libucil/src/ucil_rawavi.c 2010-01-16 22:51:48 +0000
++++ libucil/src/ucil_rawavi.c 2010-08-28 09:16:53 +0000
+@@ -561,7 +561,7 @@
+ memcpy( &dst_buffer->fill_time, &buffer->fill_time, sizeof( struct timeval ) );
+ buffer->flags &= ~UNICAP_FLAGS_BUFFER_LOCKED;
+ sem_wait( &vobj->lock );
+- g_queue_push_tail( vobj->full_queue, buffer );
++ g_queue_push_tail( vobj->full_queue, dst_buffer );
+ sem_post( &vobj->lock );
+ }
+
+
diff --git a/libucil.spec b/libucil.spec
index ab757ea..6da5530 100644
--- a/libucil.spec
+++ b/libucil.spec
@@ -1,7 +1,7 @@
Summary: Library to render text and graphic overlays onto video images
Name: libucil
Version: 0.9.8
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.unicap-imaging.org/
@@ -13,6 +13,12 @@ Patch0: libucil-0.9.8-alsa.patch
# Part of the fix commited in upstream r61
Patch1: libucil-0.9.8-segv.patch
+# upstream patch for #632439
+Patch2: libucil-0.9.8-bz632439.patch
+
+# check return value of theora_encode_init() (#627890)
+Patch3: libucil-0.9.8-bz627890.patch
+
BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4
BuildRequires: libunicap-devel, glib2-devel, pango-devel, alsa-lib-devel
BuildRequires: libtheora-devel, libogg-devel, libvorbis-devel, libpng-devel
@@ -40,6 +46,8 @@ documentation of the library, too.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%configure --disable-rpath --enable-gtk-doc
@@ -76,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/%{name}
%changelog
+* Wed Sep 15 2010 Kamil Dudka <kdudka at redhat.com> 0.9.8-5
+- upstream patch for #632439
+- check return value of theora_encode_init() (#627890)
+
* Wed Aug 25 2010 Kamil Dudka <kdudka at redhat.com> 0.9.8-4
- fix SIGSEGV in ucil_theora_encode_thread (#627161)
More information about the scm-commits
mailing list