From bac56fad6da37af95e0195f599f06397c7abf7fc Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Fri, 23 Nov 2007 08:44:40 +0000
Subject: [PATCH] Checks for null-pointers by Paul Warren, bug 209676.

---
 .../settings/model/util/PathEntryTranslator.java   | 14 ++++++++------
 .../cdt/internal/core/index/IndexFactory.java      | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java
index 24de1faab44..93333648601 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java
@@ -2527,12 +2527,14 @@ public class PathEntryTranslator {
 
 			public boolean visit(PathSettingsContainer container) {
 				CResourceData data = (CResourceData)container.getValue();
-				PathEntryCollector child = cr.createChild(container.getPath());
-				for(int i = 0; i < kinds.length; i++){
-					List list = new ArrayList();
-					if(collectEntries(kinds[i], data, list)){
-						ICLanguageSettingEntry[] entries = (ICLanguageSettingEntry[])list.toArray(new ICLanguageSettingEntry[list.size()]);
-						child.setEntries(kinds[i], entries, exportedSettings);
+				if (data != null) {
+					PathEntryCollector child = cr.createChild(container.getPath());
+					for(int i = 0; i < kinds.length; i++){
+						List list = new ArrayList();
+						if(collectEntries(kinds[i], data, list)){
+							ICLanguageSettingEntry[] entries = (ICLanguageSettingEntry[])list.toArray(new ICLanguageSettingEntry[list.size()]);
+							child.setEntries(kinds[i], entries, exportedSettings);
+						}
 					}
 				}
 				return true;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
index c5f053fc7af..1456b8de679 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
@@ -215,13 +215,15 @@ public class IndexFactory {
 		if(pd!=null) {
 			IndexProviderManager ipm = CCoreInternals.getPDOMManager().getIndexProviderManager();
 			ICConfigurationDescription cfg= pd.getDefaultSettingConfiguration();
-			try {
-				IIndexFragment[] pFragments= ipm.getProvidedIndexFragments(cfg);
-				for(int i=0; i<pFragments.length; i++) {
-					safeAddFragment(fragments, pFragments[i]);
+			if (cfg != null) {
+				try {
+					IIndexFragment[] pFragments= ipm.getProvidedIndexFragments(cfg);
+					for(int i=0; i<pFragments.length; i++) {
+						safeAddFragment(fragments, pFragments[i]);
+					}
+				} catch(CoreException ce) {
+					CCorePlugin.log(ce);
 				}
-			} catch(CoreException ce) {
-				CCorePlugin.log(ce);
 			}
 		}
 	}