From 2290223ab34741b2e96b63191294d1aa19ce8147 Mon Sep 17 00:00:00 2001
From: Vladimir Hirsl <vhirsl@ca.ibm.com>
Date: Mon, 6 Jun 2005 20:22:51 +0000
Subject: [PATCH] Fix for NPE in DOMSourceIndexerRunner.AddMarkerProblem.run().
 Possible fix for PR 98571: Multiple "Starter.exe" and "cygpath.exe" when
 launch IDE

---
 .../core/scannerconfig/util/CygpathTranslator.java     |  1 +
 .../index/domsourceindexer/DOMSourceIndexerRunner.java | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java
index 9ecd7a84331..53bbf8cb6c9 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java
@@ -123,6 +123,7 @@ public class CygpathTranslator {
                 }
             }
         }
+        cygpath.cygPath.dispose();
         return translatedIncludePaths;
     }
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
index 1d6c21e4517..96f9321169a 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
@@ -351,7 +351,7 @@ public class DOMSourceIndexerRunner extends AbstractIndexer {
 	        if (location != null) {
 	            try {
 	                //we only ever add index markers on the file, so DEPTH_ZERO is far enough
-	                IMarker[] markers = resource.findMarkers(ICModelMarker.INDEXER_MARKER, true,IResource.DEPTH_ZERO);
+	                IMarker[] markers = resource.findMarkers(ICModelMarker.INDEXER_MARKER, true, IResource.DEPTH_ZERO);
 	                
 	                boolean newProblem = true;
 	                
@@ -363,9 +363,13 @@ public class DOMSourceIndexerRunner extends AbstractIndexer {
 	                    
 	                    for (int i=0; i<markers.length; i++) {
 	                        tempMarker = markers[i];
-	                        nameStart = ((Integer) tempMarker.getAttribute(IMarker.CHAR_START)).intValue();
+                            tempMsgString = (String) tempMarker.getAttribute(IMarker.MESSAGE);
+                            Integer tempInt = (Integer) tempMarker.getAttribute(IMarker.CHAR_START);
+                            if (tempInt == null) {
+                                continue;
+                            }
+	                        nameStart = tempInt.intValue();
 	                        nameLen = ((Integer) tempMarker.getAttribute(IMarker.CHAR_END)).intValue() - nameStart;
-	                        tempMsgString = (String) tempMarker.getAttribute(IMarker.MESSAGE);
 	                        if (nameStart != -1 && 
 	                                nameStart == location.getNodeOffset() &&
 	                                nameLen == location.getNodeLength() &&