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

GT-3198 - fix FunctionBitPatternExplorerPlugin xml handling - codereview

Browse source 
Tweak output format, catch null value.
This commit is contained in:
dev747368 2019-10-01 16:46:04 -04:00
parent 2c9b771d13
commit e5184277ef
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/ContextRegisterInfo.java
View file

@ -166,7 +166,9 @@ public class ContextRegisterInfo {
Element e = new Element(XML_ELEMENT_NAME); Element e = new Element(XML_ELEMENT_NAME);
e.setAttribute("contextRegister", contextRegister); e.setAttribute("contextRegister", contextRegister);
e.setAttribute("value", value); if (value != null) {
e.setAttribute("value", value);
}
return e; return e;
} }

2
Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FileBitPatternInfo.java
View file

@ -287,7 +287,7 @@ public class FileBitPatternInfo {
Element rootEle = toXml(); Element rootEle = toXml();
Document doc = new Document(rootEle); Document doc = new Document(rootEle);
XmlUtilities.writeDocToFile(doc, destFile); XmlUtilities.writePrettyDocToFile(doc, destFile);
} }
/** /**

18
Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java
View file

@ -27,6 +27,7 @@ import javax.xml.parsers.SAXParserFactory;
import org.jdom.*; import org.jdom.*;
import org.jdom.input.SAXBuilder; import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter; import org.jdom.output.XMLOutputter;
import org.xml.sax.*; import org.xml.sax.*;
@ -219,6 +220,23 @@ public class XmlUtilities {
} }
} }
/**
* Writes a JDOM XML {@link Document} to a {@link File}, with a prettier
* format than {@link #writeDocToFile(Document, File)}.
* <p>
*
* @param doc JDOM XML {@link Document} to write.
* @param dest {@link File} to write to.
* @throws IOException if error when writing file.
*/
public static void writePrettyDocToFile(Document doc, File dest) throws IOException {
XMLOutputter outputter = new XMLOutputter();
outputter.setFormat(Format.getPrettyFormat());
try (FileWriter fw = new FileWriter(dest)) {
outputter.output(doc, fw);
}
}
/** /**
* Read a File and convert to jdom xml doc. * Read a File and convert to jdom xml doc.
* <p> * <p>