Ghidra is a software reverse engineering (SRE) framework
GP-7382 - Updated the Paste Bytes command to be consistent in error reporting
dragonmacher6948eaa3dc3f
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.javaindex e0e6ed8682..15427c93af 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java@@ -197,11 +197,7 @@ public class CodeBrowserClipboardProvider extends ByteCopier}}- if (super.pasteBytes(pasteData)) {- return true;- }-- tool.setStatusInfo("Paste failed: unsupported data type", true);+ return super.pasteBytes(pasteData);}catch (Exception e) {String msg = e.getMessage();diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/ByteCopier.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/ByteCopier.javaindex dac8139f74..8f3149919d 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/ByteCopier.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/ByteCopier.java@@ -35,6 +35,7 @@ import ghidra.program.model.util.MemoryByteIterator;import ghidra.program.util.ProgramLocation;import ghidra.program.util.ProgramSelection;import ghidra.util.*;+import ghidra.util.datastruct.Counter;import ghidra.util.task.TaskMonitor;/**@@ -445,24 +446,24 @@ public abstract class ByteCopier {public boolean applyTo(Program program) {String validString = string;if (!isOnlyAsciiBytes(string)) {- tool.setStatusInfo("Pasted string contained non-text ascii bytes. " +- "Only the ascii will be used.", true);+ status = "Pasted string contained non-text ascii bytes. " ++ "Only the ascii will be used.";validString = keepOnlyAsciiBytes(string);}byte[] bytes = getBytes(validString);if (bytes == null) {status = "Improper data format. Expected sequence of hex bytes";- tool.beep();return false;}// Ensure that we are not writing over instructions+ Counter available = new Counter();Address address = currentLocation.getAddress();- if (!hasEnoughSpace(program, address, bytes.length)) {+ if (!hasEnoughSpace(program, address, bytes.length, available)) {status =- "Not enough space to paste all bytes. Encountered data or instructions.";- tool.beep();+ "Not enough space. %s bytes pasted; space for %s bytes".formatted(bytes.length,+ available.count());return false;}@@ -474,8 +475,7 @@ public abstract class ByteCopier {boolean pastedAllBytes = pasteBytes(program, bytes);if (!pastedAllBytes) {- tool.setStatusInfo("Not all bytes were pasted due to memory access issues",- true);+ status = "Not all bytes were pasted due to memory access issues";}return true;@@ -513,23 +513,21 @@ public abstract class ByteCopier {return result != OptionDialog.NO_OPTION;}- protected boolean hasEnoughSpace(Program program, Address address, int byteCount) {+ protected boolean hasEnoughSpace(Program program, Address address, int byteCount,+ Counter bytesAvailable) {Listing listing = program.getListing();for (int i = 0; i < byteCount;) {if (address == null) {- status = "Not enough addresses to paste bytes";- tool.beep();return false;}CodeUnit codeUnit = listing.getCodeUnitContaining(address);if (!(codeUnit instanceof Data data) || data.isDefined()) {- status = "Cannot paste on top of defined instructions/data";- tool.beep();return false;}int length = codeUnit.getLength();i += length;address = codeUnit.getMaxAddress().next();+ bytesAvailable.setValue(i);}return true;}diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/ToolTaskManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/ToolTaskManager.javaindex 8b95d24283..cd43172dae 100644--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/ToolTaskManager.java+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/ToolTaskManager.java@@ -145,7 +145,7 @@ public class ToolTaskManager implements Runnable {if (cmdMessage != null) {statusMessage += ": " + cmdMessage;}- tool.setStatusInfo(statusMessage);+ tool.setStatusInfo(statusMessage, true);}return success;