forked from pool/patch
113fbdee3e
- ed-style-01-missing-input-files.patch: Allow input files to be missing for ed-style patches. - ed-style-02-fix-arbitrary-command-execution.patch, ed-style-03-update-test-Makefile.patch: Fix arbitrary command execution in ed-style patches. - ed-style-04-invoke-ed-directly.patch: Invoke ed directly instead of using the shell. - ed-style-05-minor-cleanups.patch: Minor cleanups in do_ed_script. - ed-style-06-fix-test-failure.patch: Fix 'ed-style' test failure. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=58
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From: Andreas Gruenbacher <agruen@gnu.org>
|
|
Date: Fri, 6 Apr 2018 11:34:51 +0200
|
|
Subject: Allow input files to be missing for ed-style patches
|
|
Patch-mainline: yes
|
|
Git-commit: b5a91a01e5d0897facdd0f49d64b76b0f02b43e1
|
|
References: bsc#1088420, savannah#53566, CVE-2018-1000156
|
|
|
|
* src/pch.c (do_ed_script): Allow input files to be missing so that new
|
|
files will be created as with non-ed-style patches.
|
|
---
|
|
src/pch.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/src/pch.c
|
|
+++ b/src/pch.c
|
|
@@ -2394,9 +2394,11 @@ do_ed_script (char const *inname, char c
|
|
|
|
if (! dry_run && ! skip_rest_of_patch) {
|
|
int exclusive = *outname_needs_removal ? 0 : O_EXCL;
|
|
- assert (! inerrno);
|
|
- *outname_needs_removal = true;
|
|
- copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
|
|
+ if (inerrno != ENOENT)
|
|
+ {
|
|
+ *outname_needs_removal = true;
|
|
+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
|
|
+ }
|
|
sprintf (buf, "%s %s%s", editor_program,
|
|
verbosity == VERBOSE ? "" : "- ",
|
|
outname);
|