[libcdio/f16] fixed #804484 (/usr/bin/cd-info was killed by signal 11)

Adrian Reber adrian at fedoraproject.org
Fri Mar 23 15:13:10 UTC 2012


commit 58cdfbaf3ee6a2ca99dae0498cbbf467e59fb581
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri Mar 23 16:13:05 2012 +0100

    fixed #804484 (/usr/bin/cd-info was killed by signal 11)

 libcdio-fix-for-more-than-99-tracks.diff |   11 +++++++++++
 libcdio.spec                             |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/libcdio-fix-for-more-than-99-tracks.diff b/libcdio-fix-for-more-than-99-tracks.diff
new file mode 100644
index 0000000..fccf1cd
--- /dev/null
+++ b/libcdio-fix-for-more-than-99-tracks.diff
@@ -0,0 +1,11 @@
+diff -up ./lib/driver/cdtext.c.sdg ./lib/driver/cdtext.c
+--- ./lib/driver/cdtext.c.sdg	2009-05-16 23:02:15.000000000 -0400
++++ ./lib/driver/cdtext.c	2012-03-20 22:44:37.215566980 -0400
+@@ -208,6 +208,7 @@ cdtext_data_init(void *p_user_data, trac
+       if( p_data->seq != i ) break;
+ 
+       for( j=0; j < CDIO_CDTEXT_MAX_TEXT_DATA; j++ ) {
++	if (i_track > 99) break;
+ 	if( p_data->text[j] == 0x00 ) {
+ 	  bool b_field_set=true;
+ 	  switch( p_data->type) {
diff --git a/libcdio.spec b/libcdio.spec
index 4350a6c..9290e6d 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -1,6 +1,6 @@
 Name: libcdio
 Version: 0.82
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: CD-ROM input and control library
 Group: System Environment/Libraries
 License: GPLv3+
@@ -11,6 +11,7 @@ Source2: libcdio-no_date_footer.hml
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: libcdio-0.82-sprintf.patch
 Patch2: libcdio-0.82-staticanal.patch
+Patch3: libcdio-fix-for-more-than-99-tracks.diff
 BuildRequires: pkgconfig doxygen
 BuildRequires: ncurses-devel
 BuildRequires: help2man
@@ -39,6 +40,7 @@ This package contains header files and libraries for %{name}.
 %setup -q
 %patch1 -p1 -b .sprintf
 %patch2 -p1 -b .staticanal
+%patch3 -p0
 
 f=src/cd-paranoia/doc/ja/cd-paranoia.1.in
 iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -135,6 +137,9 @@ fi
 
 
 %changelog
+* Fri Mar 23 2012 Adrian Reber <adrian at lisas.de> - 0.82-6
+- fixed #804484 (/usr/bin/cd-info was killed by signal 11)
+
 * Mon May 30 2011 Honza Horak <hhorak at redhat.com> - 0.82-5
 - applied patch to fix issues found by static analyses
 


More information about the scm-commits mailing list