diff options
| author | Boris Grozev <boris@jitsi.org> | 2014-12-04 18:02:04 +0200 |
|---|---|---|
| committer | Boris Grozev <boris@jitsi.org> | 2014-12-04 18:02:04 +0200 |
| commit | bc785671e33ec6a7db367b27fb97dd7d9854419d (patch) | |
| tree | 3792d1506d317f8b89bc440872517072a1385853 /src/net/java/sip/communicator/plugin | |
| parent | 92ae62a7b958f0402e12709fea2ec7525b90067f (diff) | |
| download | jitsi-bc785671e33ec6a7db367b27fb97dd7d9854419d.zip jitsi-bc785671e33ec6a7db367b27fb97dd7d9854419d.tar.gz jitsi-bc785671e33ec6a7db367b27fb97dd7d9854419d.tar.bz2 | |
Revert "Disable XML external entities before parsing."
This reverts commit b1e75a29614352a74693c838be234238aaa2fb0f.
Diffstat (limited to 'src/net/java/sip/communicator/plugin')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java | 7 | ||||
| -rwxr-xr-x | src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java index 9737a37..9abaad6 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java @@ -23,7 +23,6 @@ import net.java.sip.communicator.plugin.desktoputil.*; import net.java.sip.communicator.util.*; import org.jitsi.service.fileaccess.*; -import org.jitsi.util.xml.*; import org.osgi.framework.*; import org.w3c.dom.*; import org.xml.sax.*; @@ -240,9 +239,8 @@ public class JabberServerChooserDialog } FileInputStream fis = new FileInputStream(localServersListFile); - DocumentBuilderFactory factory - = DocumentBuilderFactory.newInstance(); - XMLUtils.disableExternalEntities(factory); + DocumentBuilderFactory factory = DocumentBuilderFactory + .newInstance(); DocumentBuilder constructor = factory.newDocumentBuilder(); Document document = constructor.parse(fis); Element root = document.getDocumentElement(); @@ -316,7 +314,6 @@ public class JabberServerChooserDialog // Create a builder factory DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - XMLUtils.disableExternalEntities(factory); // Create the builder and parse the file serverComments = factory.newDocumentBuilder() diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf index e1b222c..2ad0e96 100755 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf @@ -46,6 +46,5 @@ Import-Package: org.osgi.framework, javax.swing.tree, javax.swing.undo, javax.swing.border, - org.jitsi.util.xml, org.jivesoftware.smack, org.jivesoftware.smack.packet |