cpio/cpio-pattern-file-sigsegv.patch
Martin Pluskal c5e3d07b62 Accepting request 1094882 from home:dspinella:branches:Archiving
- Update to 2.14:
  * New option --ignore-dirnlink
    Valid in copy-out mode, it instructs cpio to ignore the actual number of
    links reported for each directory member and always store 2 instead.
  * Changes in --reproducible option
    The --reproducible option implies --ignore-dirlink.  In other words, it is
    equivalent to --ignore-devno --ignore-dirnlink --renumber-inodes.
  * Use GNU ls algorithm for deciding timestamp format in -tv mode
  * Fix cpio header verification.
  * Fix handling of device numbers on copy out.
  * Fix calculation of CRC in copy-out mode.
  * Rewrite the fix for CVE-2015-1197.
  * Fix combination of --create --append --directory.
  * Fix appending to archives bigger than 2G.
- Refresh patches:
  * cpio-open_nonblock.patch
  * cpio-dev_number.patch
  * cpio-default_tape_dev.patch
  * cpio-pattern-file-sigsegv.patch
- Remove patches:
  * cpio-revert-CVE-2015-1197-fix.patch
  * fix-CVE-2021-38185.patch
  * fix-CVE-2021-38185_2.patch
  * fix-CVE-2021-38185_3.patch

OBS-URL: https://build.opensuse.org/request/show/1094882
OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=91
2023-06-23 13:45:55 +00:00

22 lines
681 B
Diff

Index: cpio-2.14/src/copyin.c
===================================================================
--- cpio-2.14.orig/src/copyin.c
+++ cpio-2.14/src/copyin.c
@@ -949,6 +949,8 @@ read_pattern_file (void)
pattern_fp = fopen (pattern_file_name, "r");
if (pattern_fp == NULL)
open_fatal (pattern_file_name);
+ else
+ {
while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
{
if (new_num_patterns == max_new_patterns)
@@ -963,6 +965,7 @@ read_pattern_file (void)
if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
close_error (pattern_file_name);
+ }
for (i = 0; i < num_patterns; ++i)
new_save_patterns[i] = save_patterns[i];