Fix segmentation fault in readom

(Resolves: #682591)
This commit is contained in:
Honza Horak 2011-03-07 17:08:16 +01:00
parent 84c00532ad
commit c19796cf73
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up cdrkit-1.1.11/readom/readom.c.readsegfault cdrkit-1.1.11/readom/readom.c
--- cdrkit-1.1.11/readom/readom.c.readsegfault 2011-03-07 15:51:46.889441591 +0100
+++ cdrkit-1.1.11/readom/readom.c 2011-03-07 15:51:50.702938263 +0100
@@ -906,7 +906,7 @@ read_ftoc(SCSI *usalp, parm_t *parmp, BO
strcpy(filename, "toc.dat");
- if (strcmp(parmp->name, "/dev/null") != 0) {
+ if (parmp != NULL && strcmp(parmp->name, "/dev/null") != 0) {
len = strlen(parmp->name);
if (len > (sizeof (filename)-5)) {

View File

@ -1,7 +1,7 @@
Summary: A collection of CD/DVD utilities Summary: A collection of CD/DVD utilities
Name: cdrkit Name: cdrkit
Version: 1.1.11 Version: 1.1.11
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
URL: http://cdrkit.org/ URL: http://cdrkit.org/
@ -16,6 +16,7 @@ Patch6: cdrkit-1.1.10-build-fix.patch
Patch7: cdrkit-1.1.11-manpagefix.patch Patch7: cdrkit-1.1.11-manpagefix.patch
Patch8: cdrkit-1.1.11-rootstat.patch Patch8: cdrkit-1.1.11-rootstat.patch
Patch9: cdrkit-1.1.11-usalinst.patch Patch9: cdrkit-1.1.11-usalinst.patch
Patch10: cdrkit-1.1.11-readsegfault.patch
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
@ -105,6 +106,7 @@ for developing applications that use libusal.
%patch7 -p1 -b .manpagefix %patch7 -p1 -b .manpagefix
%patch8 -p1 -b .rootstat %patch8 -p1 -b .rootstat
%patch9 -p1 -b .usalinst %patch9 -p1 -b .usalinst
%patch10 -p1 -b .readsegfault
find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g' find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
find doc -type f -print0 | xargs -0 chmod a-x find doc -type f -print0 | xargs -0 chmod a-x
@ -260,6 +262,10 @@ fi
%{_includedir}/usal %{_includedir}/usal
%changelog %changelog
* Mon Mar 07 2011 Honza Horak <hhorak@redhat.com> - 1.1.11-5
- Fix segmentation fault in readom
(Resolves: #682591)
* Thu Feb 17 2011 Honza Horak <hhorak@redhat.com> - 1.1.11-4 * Thu Feb 17 2011 Honza Horak <hhorak@redhat.com> - 1.1.11-4
- Library libusal is installed in order to be used by other apps - Library libusal is installed in order to be used by other apps
(Resolves: #588508) (Resolves: #588508)