Attachment 922115 Details for Bug 1123907 – Fix ported from 4.7

[patch] Fix ported from 4.7

sharutils-4.6.1-Pass-all-arguments-to-file_leader_z-formatter-when-w.patch (text/plain), 1.21 KB, created by Petr Pisar on 2014-07-29 11:31:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2014-07-29 11:31:32 UTC

Size: 1.21 KB

patch

obsolete

>From 2a73e33cca36cfc73fece2e39251b1ffa015691f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>Date: Tue, 29 Jul 2014 13:08:48 +0200
>Subject: [PATCH] Pass all arguments to file_leader_z formatter when writing
> next header
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If multi-parted archive was requested (`-l' option), the shar crashed
>while printing header for second archive part because the
>file_leader_z formatting string did get enough arguments.
>
>This patch fixes it. This change presents in upstream release 4.7.
>
>Signed-off-by: Petr PÃsaÅ <ppisar@redhat.com>
>---
> src/shar.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/shar.c b/src/shar.c
>index 8c92cc2..eed3c33 100644
>--- a/src/shar.c
>+++ b/src/shar.c
>@@ -1025,7 +1025,7 @@ change_files (const char *restore_name, off_t remaining_size)
>     char *nm = archive_name ? archive_name : "a multipart";
>     char *pz = xmalloc (sizeof(part_z) + strlen(nm) + 16);
>     sprintf (pz, part_z, part_number, nm);
>-    fprintf (output, file_leader_z, pz, "", sharpid);
>+    fprintf (output, file_leader_z, pz, "", PACKAGE, VERSION, sharpid);
>     free (pz);
>   }
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1123907: 921794 | 922113 | 922115