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

CParser: prevent crash when parsing

Browse Source 
if the trimmed token length is zero, charAt() explodes

this is likely a bad macro, but CParser should not crash regardless
This commit is contained in:
Nathan Schulte
2023-10-15 03:13:21 -05:00
committed by emteere
parent d52f314270
commit fc59ad6d8e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
View File

@@ -878,10 +878,9 @@ public class DefineTable {
pos = startPos; pos = startPos;
int endParen = strValue.indexOf(')', pos + 1); int endParen = strValue.indexOf(')', pos + 1);
if (endParen != -1) { if (endParen != -1) {
String subStr = strValue.substring(pos + 1, endParen); String subStr = strValue.substring(pos + 1, endParen).trim();
if (subStr.length() > 0) { if (subStr.length() > 0) {
int subPos = 0; int subPos = 0;
subStr = subStr.trim();
boolean isValid = Character.isJavaIdentifierStart(subStr.charAt(0)); boolean isValid = Character.isJavaIdentifierStart(subStr.charAt(0));
while (isValid && subPos < subStr.length()) { while (isValid && subPos < subStr.length()) {
char ch = subStr.charAt(subPos++); char ch = subStr.charAt(subPos++);