From 66fc579a5918c113029fdd25694a4c82a6795777 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 16 Nov 2023 13:39:58 -0800
Subject: [PATCH] Backport PR #21 to fix crashes in cdrdao and whipper

See https://bugzilla.redhat.com/show_bug.cgi?id=2238243 ,
https://github.com/cdrdao/cdrdao/pull/21 ,
https://github.com/cdrdao/cdrdao/issues/22 and
https://github.com/whipper-team/whipper/issues/591 for more
details.
---
 21.patch    | 23 +++++++++++++++++++++++
 cdrdao.spec |  5 +++++
 2 files changed, 28 insertions(+)
 create mode 100644 21.patch

diff --git a/21.patch b/21.patch
new file mode 100644
index 0000000..63e8fc9
--- /dev/null
+++ b/21.patch
@@ -0,0 +1,23 @@
+From 251a40ab42305c412674c7c2d391374d91e91c95 Mon Sep 17 00:00:00 2001
+From: Ole Bertram <git@bertr.am>
+Date: Thu, 23 Mar 2023 17:08:48 +0100
+Subject: [PATCH] Fix uninitialized TOC data file name
+
+This caused spurious garbled TOC files and/or segfaults when not using
+the `--datafile` option.
+---
+ dao/main.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dao/main.cc b/dao/main.cc
+index 8bf4590..d09fc69 100644
+--- a/dao/main.cc
++++ b/dao/main.cc
+@@ -219,6 +219,7 @@ DaoCommandLine::DaoCommandLine() :
+     fullBurn(false), withCddb(false), taoSource(false), keepImage(false), overburn(false),
+     writeSpeedControl(false), keep(false), printQuery(false), no_utf8(false)
+ {
++    dataFilename = NULL;
+     readingSpeed = -1;
+     writingSpeed = -1;
+     command = UNKNOWN;
diff --git a/cdrdao.spec b/cdrdao.spec
index dc563d1..dea8076 100644
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -11,6 +11,11 @@ Release:   %autorelease
 License:   GPLv2+
 URL:       http://cdrdao.sourceforge.net/
 Source0:   http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# https://github.com/cdrdao/cdrdao/pull/21
+# should fix whipper failure with this version of cdrdao:
+# https://github.com/whipper-team/whipper/issues/591
+# https://bugzilla.redhat.com/show_bug.cgi?id=2238243
+Patch:     21.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
 BuildRequires:  gtkmm3.0-devel