From 23caa1d0b5965dccd638416692c79ff0087b8de7 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Thu, 20 Dec 2012 21:39:02 -0500
Subject: [PATCH] bug fixes

Former-commit-id: 266897e8a32735a77f1b3e7aa1e0842e0fc69b65
---
 pom.xml                                                     | 5 +++++
 .../codesecure/dependencycheck/analyzer/JarAnalyzer.java    | 6 ++++++
 .../codesecure/dependencycheck/data/cpe/xml/Indexer.java    | 1 -
 .../dependencycheck/data/nvdcve/xml/NvdCveParser.java       | 1 -
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 795a981e6..e49860627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,6 +331,11 @@ along with DependencyCheck.  If not, see <http://www.gnu.org/licenses/>.
                                 </excludes>
                             </configuration>
                         </plugin>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>taglist-maven-plugin</artifactId>
+                            <version>2.4</version>
+                        </plugin>
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java b/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java
index db5cd4597..3444dac0b 100644
--- a/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java
+++ b/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java
@@ -482,6 +482,12 @@ public class JarAnalyzer extends AbstractAnalyzer {
     protected void parseManifest(Dependency dependency) throws IOException {
         JarFile jar = new JarFile(dependency.getActualFilePath());
         Manifest manifest = jar.getManifest();
+        if (manifest == null) {
+            Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE,
+                    "Jar file '{0}' does not contain a manifest.",
+                    dependency.getFileName());
+            return;
+        }
         Attributes atts = manifest.getMainAttributes();
 
         EvidenceCollection vendorEvidence = dependency.getVendorEvidence();
diff --git a/src/main/java/org/codesecure/dependencycheck/data/cpe/xml/Indexer.java b/src/main/java/org/codesecure/dependencycheck/data/cpe/xml/Indexer.java
index c3cc01e0d..9fd771ee4 100644
--- a/src/main/java/org/codesecure/dependencycheck/data/cpe/xml/Indexer.java
+++ b/src/main/java/org/codesecure/dependencycheck/data/cpe/xml/Indexer.java
@@ -24,7 +24,6 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StoredField;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
 import org.apache.lucene.index.Term;
 import org.codesecure.dependencycheck.data.cpe.Entry;
 import org.codesecure.dependencycheck.data.cpe.Fields;
diff --git a/src/main/java/org/codesecure/dependencycheck/data/nvdcve/xml/NvdCveParser.java b/src/main/java/org/codesecure/dependencycheck/data/nvdcve/xml/NvdCveParser.java
index f64d4b734..fde2435d0 100644
--- a/src/main/java/org/codesecure/dependencycheck/data/nvdcve/xml/NvdCveParser.java
+++ b/src/main/java/org/codesecure/dependencycheck/data/nvdcve/xml/NvdCveParser.java
@@ -33,7 +33,6 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StoredField;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
 import org.apache.lucene.index.Term;
 import org.codesecure.dependencycheck.data.cpe.Entry;
 import org.codesecure.dependencycheck.data.nvdcve.Fields;