mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-23 08:13:50 +02:00
Code Issues Wiki Activity

Fix for 196626, NPE in BinaryParser.

Browse source
This commit is contained in:
Markus Schorn 2007-07-27 09:09:08 +00:00
parent 0e4812b676
commit 9cedcf1a8e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 QNX Software Systems and others. * Copyright (c) 2000, 2007 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.utils.coff; package org.eclipse.cdt.utils.coff;
@ -745,7 +746,7 @@ public class PE {
try { try {
// the debug directory is the 6th entry // the debug directory is the 6th entry
NTOptionalHeader ntHeader = getNTOptionalHeader(); NTOptionalHeader ntHeader = getNTOptionalHeader();
if (ntHeader.NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_DEBUG) if (ntHeader==null || ntHeader.NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_DEBUG)
return null; return null;
int debugDir = ntHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress; int debugDir = ntHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
@ -761,7 +762,7 @@ public class PE {
// loop through the section headers to find the .rdata section // loop through the section headers to find the .rdata section
for (int i = 0; i < sections.length; i++) { for (int i = 0; i < sections.length; i++) {
String name = new String(sections[i].s_name).trim(); String name = new String(sections[i].s_name).trim();
if (name.equals(".rdata")) { if (name.equals(".rdata")) { //$NON-NLS-1$
// figure out the file offset of the debug ddirectory entries // figure out the file offset of the debug ddirectory entries
int offsetInto_rdata = debugDir - sections[i].s_vaddr; int offsetInto_rdata = debugDir - sections[i].s_vaddr;
int fileOffset = sections[i].s_scnptr + offsetInto_rdata; int fileOffset = sections[i].s_scnptr + offsetInto_rdata;
@ -780,7 +781,7 @@ public class PE {
// sanity check. the first four bytes of the CodeView // sanity check. the first four bytes of the CodeView
// data should be "NB11" // data should be "NB11"
String s2 = accessFile.readLine(); String s2 = accessFile.readLine();
if (s2.startsWith("NB11")) { if (s2.startsWith("NB11")) { //$NON-NLS-1$
Attribute att = getAttribute(); Attribute att = getAttribute();
symReader = new CodeViewReader(accessFile, symReader = new CodeViewReader(accessFile,
debugBase, att.isLittleEndian()); debugBase, att.isLittleEndian());
@ -808,10 +809,10 @@ public class PE {
// loop through the section headers looking for stabs info // loop through the section headers looking for stabs info
for (int i = 0; i < sections.length; i++) { for (int i = 0; i < sections.length; i++) {
String name = new String(sections[i].s_name).trim(); String name = new String(sections[i].s_name).trim();
if (name.equals(".stab")) { if (name.equals(".stab")) { //$NON-NLS-1$
stab = sections[i].getRawData(); stab = sections[i].getRawData();
} }
if (name.equals(".stabstr")) { if (name.equals(".stabstr")) { //$NON-NLS-1$
stabstr = sections[i].getRawData(); stabstr = sections[i].getRawData();
} }
} }