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

[Jan Horak]

commit 91c27b18d364a8e27c4b151623a84f27c7c6d546
Author: Honza Horak <hhorak at redhat.com>
Date:   Mon Mar 7 17:43:03 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 61c047e..30ec335 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: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -13,6 +13,7 @@ Patch4: cdrkit-1.1.9-no_mp3.patch
 Patch5: cdrkit-1.1.9-buffer_overflow.patch
 #Patch6: cdrkit-1.1.9-rr_joliet.patch
 Patch6: cdrkit-1.1.10-build-fix.patch
+Patch7: cdrkit-1.1.11-readsegfault.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
 
@@ -88,6 +89,7 @@ rates. Icedax can also be used as a CD player.
 %patch5 -p1 -b .buffer_overflow
 #%patch6 -p1 -b .rr_joliet
 %patch6 -p1 -b .build-fix
+%patch7 -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 
@@ -234,6 +236,10 @@ fi
 %{_mandir}/man1/dirsplit.*
 
 %changelog
+* Mon Mar 07 2011 Honza Horak <hhorak at redhat.com> - 1.1.11-2
+- Fix segmentation fault in readom
+  (Resolves: #682591)
+
 * Mon Oct 18 2010 Nikola Pajkovsky <npajkovs at redhat.com> 1.1.11-1
 - new upstream version 1.1.11