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

GT-2698 - fix html escaping to use simpler method.

Browse source
This commit is contained in:
dev747368 2019-04-15 18:18:15 -04:00
parent 6448f0da8f
commit fa7173f9ab
60 changed files with 109 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ApplyBlockedMatchAction.java
View file

@ -119,10 +119,9 @@ public class ApplyBlockedMatchAction extends DockingAction {
private String getAssociationDisplayString(VTAssociation association) {
return association.getType().toString() + " match with source of <b>" +
HTMLUtilities.friendlyEncodeHTML(association.getSourceAddress().toString()) +
HTMLUtilities.escapeHTML(association.getSourceAddress().toString()) +
"</b> and destination of <b>" +
HTMLUtilities.friendlyEncodeHTML(association.getDestinationAddress().toString()) +
"</b>";
HTMLUtilities.escapeHTML(association.getDestinationAddress().toString()) + "</b>";
}
@Override

6
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/wizard/SummaryPanel.java
View file

@ -99,8 +99,8 @@ public class SummaryPanel extends AbstractMageJPanel<VTWizardStateKey> {
// source program
label.append("Source Program:");
summary.append(sourceProgramName == null ? "(null)"
: HTMLUtilities.friendlyEncodeHTML(sourceProgramName));
summary.append(
sourceProgramName == null ? "(null)" : HTMLUtilities.escapeHTML(sourceProgramName));
label.append("<br>");
summary.append("<br>");
@ -108,7 +108,7 @@ public class SummaryPanel extends AbstractMageJPanel<VTWizardStateKey> {
label.append("Destination Program:");
summary.append(destinationProgramName == null ? "(null)"
: HTMLUtilities.friendlyEncodeHTML(destinationProgramName));
: HTMLUtilities.escapeHTML(destinationProgramName));
label.append("<br>");
summary.append("<br>");

4
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/wizard/VTWizardUtils.java
View file

@ -82,7 +82,7 @@ public class VTWizardUtils {
String filename = domainFile.getName();
int result = OptionDialog.showYesNoDialog(parent, "Save Version Tracking Changes?",
"<html>Unsaved Version Tracking changes found for session: " +
HTMLUtilities.friendlyEncodeHTML(filename) + ". <br>" +
HTMLUtilities.escapeHTML(filename) + ". <br>" +
"Would you like to save these changes?");
boolean doSave = result == OptionDialog.YES_OPTION;
@ -100,7 +100,7 @@ public class VTWizardUtils {
String filename = domainFile.getName();
int result = OptionDialog.showYesNoCancelDialog(parent, "Save Version Tracking Changes?",
"<html>Unsaved Version Tracking changes found for session: " +
HTMLUtilities.friendlyEncodeHTML(filename) + ". <br>" +
HTMLUtilities.escapeHTML(filename) + ". <br>" +
"Would you like to save these changes?");
if (result == OptionDialog.CANCEL_OPTION) {