Ghidra is a software reverse engineering (SRE) framework
CParser: prevent crash when parsing
Nathan Schultefc59ad6d8ed0
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.javaindex 11ece4ed2c..c84c90e05d 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java@@ -878,10 +878,9 @@ public class DefineTable {pos = startPos;int endParen = strValue.indexOf(')', pos + 1);if (endParen != -1) {- String subStr = strValue.substring(pos + 1, endParen);+ String subStr = strValue.substring(pos + 1, endParen).trim();if (subStr.length() > 0) {int subPos = 0;- subStr = subStr.trim();boolean isValid = Character.isJavaIdentifierStart(subStr.charAt(0));while (isValid && subPos < subStr.length()) {char ch = subStr.charAt(subPos++);