Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Magloire2004-12-09 18:44:59 +0000
committerAlain Magloire2004-12-09 18:44:59 +0000
commit61648012983afdd1bb5c8320132d2d198a51b81c (patch)
tree75a140134adbb768faef9fb83c753a8444ebc2ee
parentdbf20bee131483d6c7b50729230b45021c188f7a (diff)
downloadorg.eclipse.cdt-61648012983afdd1bb5c8320132d2d198a51b81c.tar.gz
org.eclipse.cdt-61648012983afdd1bb5c8320132d2d198a51b81c.tar.xz
org.eclipse.cdt-61648012983afdd1bb5c8320132d2d198a51b81c.zip
2004-12-09 Alain MagloireCDT_2_1_RC6
Fix for 80620 * utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
-rw-r--r--core/org.eclipse.cdt.core/ChangeLog4
-rw-r--r--core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java8
2 files changed, 9 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 700b188a270..76324845a72 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-02 Alain Magloire
Fix for PR 40081.
For Cygwin use NM to get the global variables.
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) {

Back to the top