From peters at alioth.debian.org  Thu Jun  2 15:53:25 2011
From: peters at alioth.debian.org (Peter Samuelson)
Date: Thu,  2 Jun 2011 15:53:25 +0000
Subject: [Debburn-changes] r860 - in cdrkit/trunk: . icedax
Message-ID: <E1QSAD7-0000Vu-B2@vasks.debian.org>

Author: peters
Date: 2011-06-02 15:53:25 +0000 (Thu, 02 Jun 2011)
New Revision: 860

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/icedax/icedax.c
Log:
Trivial fix for a segfault in an exit path.  Patch from Honza Horak.


Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2011-03-07 07:56:51 UTC (rev 859)
+++ cdrkit/trunk/Changelog	2011-06-02 15:53:25 UTC (rev 860)
@@ -2,6 +2,7 @@
 
   [ Honza Hor?k ]
   * genisoimage.1: Document several more flags and aliases.
+  * icedax.c: Fix a segfault on exit (Red Hat bug #709902).
 
   [ Ville Skytt? ]
   * Fix several typos in genisoimage.1, icedax.1 and the genisoimage help text.

Modified: cdrkit/trunk/icedax/icedax.c
===================================================================
--- cdrkit/trunk/icedax/icedax.c	2011-03-07 07:56:51 UTC (rev 859)
+++ cdrkit/trunk/icedax/icedax.c	2011-06-02 15:53:25 UTC (rev 860)
@@ -1054,7 +1054,7 @@
 
 	if (child_pid != 0) {
 		SCSI *usalp = get_scsi_p();
-		if (usalp->running) {
+		if (usalp && usalp->running) {
 			usalp->cb_fun = on_exitscsi;
 			usalp->cb_arg = (void *) (uintptr_t) status;
 		} else {