From 61c0dd0e480c638c46d84a6a5bd8e092ef20847a Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Thu, 9 Dec 2004 18:45:31 +0000 Subject: [PATCH] 2004-12-09 Alain Magloire Fix for 80620 * utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java --- core/org.eclipse.cdt.core/ChangeLog | 4 ++++ .../cdt/utils/coff/parser/CygwinPEBinaryObject.java | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 446802cefbf..f83dc3e9743 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,7 @@ +2004-12-09 Alain Magloire + Fix for 80620 + * utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java + 2004-12-08 Vladimir Hirsl Removed some dead code in ReaderThread class. * src/org/eclipse/cdt/internal/core/ProcessClosure.java diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java index ee1d876bc47..55ebb4e7504 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java @@ -186,9 +186,11 @@ public class CygwinPEBinaryObject extends PEBinaryObject { // Add any global symbols NM nm = getNM(); - NM.AddressNamePair[] pairs = nm.getBSSSymbols(); - for (int i = 0; i < pairs.length; ++i) { - addSymbol(pairs[i], list, ISymbol.VARIABLE); + if (nm != null) { + NM.AddressNamePair[] pairs = nm.getBSSSymbols(); + for (int i = 0; i < pairs.length; ++i) { + addSymbol(pairs[i], list, ISymbol.VARIABLE); + } } // pairs = nm.getTextSymbols(); // for (int i = 0; i < pairs.length; ++i) {