mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fixing name comparison in XCoffSymbol.java (Closes #9558)

Browse Source
This commit is contained in:
Ryan Kurtz
2026-08-31 05:54:03 -04:00
parent af343f0cd8
commit b070495c0b
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffSymbol.java
View File

@@ -1,13 +1,12 @@
/* ### /* ###
* IP: GHIDRA * IP: GHIDRA
* REVIEWED: YES
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,10 +15,10 @@
*/ */
package ghidra.app.util.bin.format.xcoff; package ghidra.app.util.bin.format.xcoff;
import ghidra.app.util.bin.BinaryReader;
import java.io.IOException; import java.io.IOException;
import ghidra.app.util.bin.BinaryReader;
public class XCoffSymbol { public class XCoffSymbol {
private final static char NL = '\n'; private final static char NL = '\n';
@@ -59,10 +58,7 @@ public class XCoffSymbol {
} }
public boolean isLongName() { public boolean isLongName() {
return (n_name[0] == 0 && return n_name[0] == 0 && n_name[1] == 0 && n_name[2] == 0 && n_name[3] == 0;
n_name[1] == 0 &&
n_name[2] == 0 &&
n_name[3] == 0);
} }
public String getName() { public String getName() {
@@ -70,29 +66,38 @@ public class XCoffSymbol {
} }
public boolean isFunction() { public boolean isFunction() {
return ((n_sclass == XCoffSymbolStorageClass.C_EXT || n_sclass == XCoffSymbolStorageClass.C_HIDEXT || n_sclass == XCoffSymbolStorageClass.C_WEAKEXT) && String name = getName();
n_scnum == _optionalHeader.getSectionNumberForText() && return (n_sclass == XCoffSymbolStorageClass.C_EXT ||
!n_name.equals(XCoffSectionHeaderNames._TEXT)); n_sclass == XCoffSymbolStorageClass.C_HIDEXT ||
n_sclass == XCoffSymbolStorageClass.C_WEAKEXT) &&
n_scnum == _optionalHeader.getSectionNumberForText() &&
!name.equals(XCoffSectionHeaderNames._TEXT);
} }
public boolean isVariable() { public boolean isVariable() {
return ((n_sclass == XCoffSymbolStorageClass.C_EXT || n_sclass == XCoffSymbolStorageClass.C_HIDEXT || n_sclass == XCoffSymbolStorageClass.C_WEAKEXT) && String name = getName();
(n_scnum == _optionalHeader.getSectionNumberForBss() || n_scnum == _optionalHeader.getSectionNumberForData()) && return (n_sclass == XCoffSymbolStorageClass.C_EXT ||
x_smclas != XCoffSymbolStorageClassCSECT.XMC_TC0 && x_smclas != XCoffSymbolStorageClassCSECT.XMC_TC && x_smclas != XCoffSymbolStorageClassCSECT.XMC_DS && n_sclass == XCoffSymbolStorageClass.C_HIDEXT ||
!n_name.equals(XCoffSectionHeaderNames._BSS) && n_sclass == XCoffSymbolStorageClass.C_WEAKEXT) &&
!n_name.equals(XCoffSectionHeaderNames._DATA)); (n_scnum == _optionalHeader.getSectionNumberForBss() ||
n_scnum == _optionalHeader.getSectionNumberForData()) &&
x_smclas != XCoffSymbolStorageClassCSECT.XMC_TC0 &&
x_smclas != XCoffSymbolStorageClassCSECT.XMC_TC &&
x_smclas != XCoffSymbolStorageClassCSECT.XMC_DS &&
!name.equals(XCoffSectionHeaderNames._BSS) &&
!name.equals(XCoffSectionHeaderNames._DATA);
} }
@Override @Override
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuilder sb = new StringBuilder();
buffer.append("SYMBOL TABLE ENTRY").append(NL); sb.append("SYMBOL TABLE ENTRY").append(NL);
buffer.append("n_value = ").append(n_value).append(NL); sb.append("n_value = ").append(n_value).append(NL);
buffer.append("n_scnum = ").append(n_scnum).append(NL); sb.append("n_scnum = ").append(n_scnum).append(NL);
buffer.append("n_type = ").append(n_type).append(NL); sb.append("n_type = ").append(n_type).append(NL);
buffer.append("n_sclass = ").append(n_sclass).append(NL); sb.append("n_sclass = ").append(n_sclass).append(NL);
buffer.append("n_numaux = ").append(n_numaux).append(NL); sb.append("n_numaux = ").append(n_numaux).append(NL);
return buffer.toString(); return sb.toString();
} }
} }