yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-810-dragonmacher-gnu-demangler-parse-failure--SQUASHED'

Browse source
This commit is contained in:
ghidra1 2021-04-21 19:02:43 -04:00
commit 57f00f8e0b
14 changed files with 897 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java
View file

@ -2312,7 +2312,7 @@ public class SymbolManager implements SymbolTable, ManagerDB {
SourceType originalSource = namespaceSymbol.getSource();
// no duplicate check, since this class name will be set to that of the existing namespace
String tempName = name + System.nanoTime();
String tempName = "_temp_" + System.nanoTime();
SymbolDB classSymbol =
doCreateSpecialSymbol(Address.NO_ADDRESS, tempName, namespace.getParentNamespace(),
SymbolType.CLASS, -1, -1, null, originalSource, false /*check for duplicate */);
@ -2334,7 +2334,8 @@ public class SymbolManager implements SymbolTable, ManagerDB {
return classNamespace;
}
catch (DuplicateNameException | InvalidInputException | CircularDependencyException e) {
throw new AssertException("Unexpected exception creating class from namespace", e);
throw new AssertException("Unexpected exception creating class from namespace: " +
e.getMessage(), e);
}
finally {
lock.release();