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

Adrian Reber adrian at fedoraproject.org
Fri Mar 23 14:34:35 UTC 2012


commit 94bfa3e318c65e5e318787ba4c65537cb2838311
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri Mar 23 15:34:30 2012 +0100

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

 libcdio-fix-for-more-than-99-tracks.diff |   10 ++++++++++
 libcdio.spec                             |    7 ++++++-
 2 files changed, 16 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..ed8b025
--- /dev/null
+++ b/libcdio-fix-for-more-than-99-tracks.diff
@@ -0,0 +1,10 @@
+--- a/lib/driver/cdtext.c	2012-03-23 15:30:24.002795726 +0100
++++ b/lib/driver/cdtext.c	2012-03-23 15:30:59.581851545 +0100
+@@ -237,6 +237,7 @@
+       i_track = p_data->i_track;
+ 
+       for( j=0; j < CDIO_CDTEXT_MAX_TEXT_DATA; (p_data->bDBC ? j+=2 : j++) ) {
++	if (i_track > 99) break;
+         if( p_data->text[j] == 0x00 && (!p_data->bDBC || p_data->text[j+1] == 0x00)) {
+           
+           /* omit empty strings */
diff --git a/libcdio.spec b/libcdio.spec
index 067cbfd..0bf36f6 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -1,6 +1,6 @@
 Name: libcdio
 Version: 0.83
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: CD-ROM input and control library
 Group: System Environment/Libraries
 License: GPLv3+
@@ -8,6 +8,7 @@ URL: http://www.gnu.org/software/libcdio/
 Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.83.tar.bz2
 Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.83.tar.bz2.sig
 Source2: libcdio-no_date_footer.hml
+Patch0: libcdio-fix-for-more-than-99-tracks.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig doxygen
 BuildRequires: ncurses-devel
@@ -35,6 +36,7 @@ This package contains header files and libraries for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 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
@@ -131,6 +133,9 @@ fi
 
 
 %changelog
+* Fri Mar 23 2012 Adrian Reber <adrian at lisas.de> - 0.83-3
+- fixed #804484 (/usr/bin/cd-info was killed by signal 11)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.83-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list