[ant] 01/01: Merge branch '1.9.x'

[bodewig]

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit aa9ec682eac5781b835c0f2e2d0778785e6439df
Merge: 7f9c5dd 6594a2d
Author: Stefan Bodewig <bode...@apache.org>
AuthorDate: Sat Jul 10 11:15:18 2021 +0200

    Merge branch '1.9.x'

 src/main/org/apache/tools/tar/TarInputStream.java |  7 +++++--
 src/main/org/apache/tools/zip/AsiExtraField.java  | 12 ++++++++----
 src/main/org/apache/tools/zip/ZipFile.java        | 20 +++++++++++++++++++-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --cc src/main/org/apache/tools/tar/TarInputStream.java
index 0477d5c,966835e..71e4cc0
--- a/src/main/org/apache/tools/tar/TarInputStream.java
+++ b/src/main/org/apache/tools/tar/TarInputStream.java
@@@ -448,9 -452,10 +450,10 @@@ public class TarInputStream extends Fil
                                                        + " bytes, read "
                                                        + got);
                              }
+                             byte[] rest = bos.toByteArray();
                              // Drop trailing NL
                              String value = new String(rest, 0,
 -                                                      restLen - 1, "UTF-8");
 +                                                      restLen - 1, 
StandardCharsets.UTF_8);
                              headers.put(keyword, value);
                              break;
                          }