pool/dd_rescue
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 1193484 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1193484
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dd_rescue?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger
2024-08-14 12:14:09 +00:00
committed by Git OBS Bridge
parent 93c0b64f8a a58ff294aa
commit d498de117a
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dd_rescue-u-emptyout-segfault.diff Normal file
View File

@@ -0,0 +1,21 @@
commit 250bf8baf8d7a59d09a8ef48d966019972d3ee5a
Author: Kurt Garloff <kurt@garloff.de>
Date: Mon Aug 12 15:19:09 2024 +0200
Prevent segfault with -u and empty output filename.
Signed-off-by: Kurt Garloff <kurt@garloff.de>
diff --git a/dd_rescue.c b/dd_rescue.c
index 92f81d0..2d32084 100644
--- a/dd_rescue.c
+++ b/dd_rescue.c
@@ -1466,7 +1466,7 @@ int real_cleanup(opt_t *op, fstate_t *fst, progress_t *prg,
copyxattr(op->iname, op->oname);
copytimes(op->iname, op->oname);
}
- if (op->rmvtrim)
+ if (op->rmvtrim && op->oname)
remove_and_trim(op->oname, op);
LISTFOREACH(ofiles, of) {
if (op->preserve) {

6
dd_rescue.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 12 15:52:05 CEST 2024 - kurt@garloff.de
- dd_rescue-u-emptyout-segfault.diff: Prevent (cosmetic) segfault
in cleanup path with option -u and empty output file name.
-------------------------------------------------------------------
Sun Mar 3 22:47:17 CET 2024 - kurt@garloff.de

7
dd_rescue.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package dd_rescue
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,8 +31,9 @@ Source0: http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2
Source1: http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2.asc
Source2: %{name}.keyring
Source99: %{name}.changes
Patch1: dd_rescue-ossl3-evpcipherctx.diff
Patch2: dd_rescue-md5-unaligned-armv7.diff
Patch1: dd_rescue-ossl3-evpcipherctx.diff
Patch2: dd_rescue-md5-unaligned-armv7.diff
Patch3: dd_rescue-u-emptyout-segfault.diff
# PATCH-FIX-UPSTREAM no-python2.patch sf#ddrescue#4 mcepl@suse.com
# Remove dependency on python2
BuildRequires: autoconf