From da87b9ec602883b50c49714cfd1536507bd257a8 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Tue, 5 Sep 2006 19:47:56 +0000
Subject: [PATCH] bugzilla: 40334 possible NPE in TarInputStream

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@440461 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/tar/TarInputStream.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java
index 57a47ff86..9b120ce9d 100644
--- a/src/main/org/apache/tools/tar/TarInputStream.java
+++ b/src/main/org/apache/tools/tar/TarInputStream.java
@@ -258,7 +258,11 @@ public class TarInputStream extends FilterInputStream {
                 longName.append(new String(buf, 0, length));
             }
             getNextEntry();
-
+            if (this.currEntry == null) {
+                // Bugzilla: 40334
+                // Malformed tar file - long entry name not followed by entry
+                return null;
+            }
             // remove trailing null terminator
             if (longName.length() > 0
                 && longName.charAt(longName.length() - 1) == 0) {