* update cdrdao to 1.2.5-7

This commit is contained in:
Alexander Baldeck 2025-03-13 10:10:04 +01:00
parent 7b78ebf951
commit e2c6681177
2 changed files with 49 additions and 0 deletions

View File

@ -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;

View File

@ -0,0 +1,26 @@
From ada9f82dbab5b07da49ca47e0b799b456d696b1a Mon Sep 17 00:00:00 2001
From: Daniel Foster <daniel@amesite.me>
Date: Fri, 13 Oct 2023 05:51:48 +0000
Subject: [PATCH] Fix version command
---
dao/main.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dao/main.cc b/dao/main.cc
index 8bf4590..4fd447f 100644
--- a/dao/main.cc
+++ b/dao/main.cc
@@ -2489,8 +2489,10 @@ int main(int argc, char **argv)
options.commitSettings(settings, settingsPath);
// Just show version ? We're done.
- if (options.command == SHOW_VERSION)
- goto fail;
+ if (options.command == SHOW_VERSION) {
+ printVersion();
+ goto fail;
+ }
errPrintParams.no_utf8 = options.no_utf8;
filePrintParams.no_utf8 = options.no_utf8;