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

Merge remote-tracking branch

Browse source 
'origin/GP-5324_dev747368_bad_path_in_import' (Closes #7267)
This commit is contained in:
Ryan Kurtz 2025-01-30 14:35:55 -05:00
commit 6b0a707850
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Ghidra/Features/Base/src/main/java/ghidra/plugins/fsbrowser/FSBComponentProvider.java
View file

@ -27,6 +27,8 @@ import javax.swing.*;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.TreeSelectionModel;
import org.apache.commons.io.FilenameUtils;
import docking.*; import docking.*;
import docking.action.DockingAction; import docking.action.DockingAction;
import docking.action.DockingActionIf; import docking.action.DockingActionIf;
@ -544,9 +546,13 @@ public class FSBComponentProvider extends ComponentProviderAdapter
Swing.runLater(() -> openWithTarget.open(List.of(df))); Swing.runLater(() -> openWithTarget.open(List.of(df)));
return; return;
} }
ImporterUtilities.showImportSingleFileDialog(fullFsrl, null,
fileNode.getFormattedTreePath(), plugin.getTool(), openWithTarget.getPm(), String suggestedPath =
monitor); FilenameUtils.getFullPathNoEndSeparator(fileNode.getFormattedTreePath())
.replaceAll(":/", "/");
ImporterUtilities.showImportSingleFileDialog(fullFsrl, null, suggestedPath,
plugin.getTool(), openWithTarget.getPm(), monitor);
} }
catch (IOException | CancelledException e) { catch (IOException | CancelledException e) {
// fall thru // fall thru
@ -581,5 +587,4 @@ public class FSBComponentProvider extends ComponentProviderAdapter
} }
} }
} }