From 654072913192fd9b5fe0c325166933b20bcaf416 Mon Sep 17 00:00:00 2001
From: Mike Kucera <mkucera@ca.ibm.com>
Date: Thu, 22 May 2008 18:42:31 +0000
Subject: [PATCH] fix for NPE in LR parser

---
 .../cdt/internal/core/parser/scanner/CPreprocessor.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
index 03536c9e8de..9a81eadbc30 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
@@ -283,9 +283,11 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
         }
 
         IMacro[] toAdd = config.getAdditionalMacros();
-        for (final IMacro macro : toAdd) {
-        	addMacroDefinition(macro.getSignature(), macro.getExpansion());
-		}
+        if(toAdd != null) {
+        	for (final IMacro macro : toAdd) {
+        		addMacroDefinition(macro.getSignature(), macro.getExpansion());
+        	}
+        }
         
         final Map<String, String> macroDict= info.getDefinedSymbols();
         if (macroDict != null) {