[cdrkit] Fix segmentation fault in readom (Resolves: #682591)

[Jan Horak]

commit c19796cf7363e7e6a37aab534f515d87c661dc99
Author: Honza Horak <hhorak at redhat.com>
Date:   Mon Mar 7 17:08:16 2011 +0100

    Fix segmentation fault in readom
    (Resolves: #682591)

 cdrkit-1.1.11-readsegfault.patch |   12 ++++++++++++
 cdrkit.spec                      |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/cdrkit-1.1.11-readsegfault.patch b/cdrkit-1.1.11-readsegfault.patch
new file mode 100644
index 0000000..a3a1305
--- /dev/null
+++ b/cdrkit-1.1.11-readsegfault.patch
@@ -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)) {
diff --git a/cdrkit.spec b/cdrkit.spec
index 019e240..5592af7 100644
--- a/cdrkit.spec
+++ b/cdrkit.spec
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -16,6 +16,7 @@ Patch6: cdrkit-1.1.10-build-fix.patch
 Patch7: cdrkit-1.1.11-manpagefix.patch
 Patch8: cdrkit-1.1.11-rootstat.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
 
@@ -105,6 +106,7 @@ for developing applications that use libusal.
 %patch7 -p1 -b .manpagefix
 %patch8 -p1 -b .rootstat
 %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 doc -type f -print0 | xargs -0 chmod a-x 
@@ -260,6 +262,10 @@ fi
 %{_includedir}/usal
 
 %changelog
+* Mon Mar 07 2011 Honza Horak <hhorak at redhat.com> - 1.1.11-5
+- Fix segmentation fault in readom
+  (Resolves: #682591)
+
 * Thu Feb 17 2011 Honza Horak <hhorak at redhat.com> - 1.1.11-4
 - Library libusal is installed in order to be used by other apps
   (Resolves: #588508)