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

This commit is contained in:
Adrian Reber 2012-03-23 15:34:30 +01:00
parent 1d90b05aab
commit 94bfa3e318
2 changed files with 16 additions and 1 deletions

View File

@ -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 */

View File

@ -1,6 +1,6 @@
Name: libcdio Name: libcdio
Version: 0.83 Version: 0.83
Release: 2%{?dist} Release: 3%{?dist}
Summary: CD-ROM input and control library Summary: CD-ROM input and control library
Group: System Environment/Libraries Group: System Environment/Libraries
License: GPLv3+ 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 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 Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.83.tar.bz2.sig
Source2: libcdio-no_date_footer.hml Source2: libcdio-no_date_footer.hml
Patch0: libcdio-fix-for-more-than-99-tracks.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig doxygen BuildRequires: pkgconfig doxygen
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
@ -35,6 +36,7 @@ This package contains header files and libraries for %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1
f=src/cd-paranoia/doc/ja/cd-paranoia.1.in 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 iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@ -131,6 +133,9 @@ fi
%changelog %changelog
* Fri Mar 23 2012 Adrian Reber <adrian@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@lists.fedoraproject.org> - 0.83-2 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.83-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild