Merge remote-tracking branch 'origin/patch'

This commit is contained in:
Ryan Kurtz
2025-04-03 13:18:59 -04:00
4 changed files with 20 additions and 15 deletions

View File

@@ -144,9 +144,9 @@ public class DWARFLineInfoSourceMapScript extends GhidraScript {
SourceFile source = sfasToSourceFiles.get(sourceFileAddr);
if (source == null) {
String path = SourceFileUtils.fixDwarfRelativePath(sourceFileAddr.fileName(),
COMPILATION_ROOT_DIRECTORY);
try {
String path = SourceFileUtils.normalizeDwarfPath(sourceFileAddr.fileName(),
COMPILATION_ROOT_DIRECTORY);
SourceFileIdType type =
sourceFileAddr.md5() == null ? SourceFileIdType.NONE : SourceFileIdType.MD5;
source = new SourceFile(path, type, sourceFileAddr.md5());