aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/service
diff options
context:
space:
mode:
authorBoris Grozev <boris@jitsi.org>2014-12-04 18:02:04 +0200
committerBoris Grozev <boris@jitsi.org>2014-12-04 18:02:04 +0200
commitbc785671e33ec6a7db367b27fb97dd7d9854419d (patch)
tree3792d1506d317f8b89bc440872517072a1385853 /src/net/java/sip/communicator/service
parent92ae62a7b958f0402e12709fea2ec7525b90067f (diff)
downloadjitsi-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/service')
-rw-r--r--src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
index 3d8778c..2641fce 100644
--- a/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
+++ b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
@@ -224,11 +224,8 @@ public class ConferenceInfoDocument
try
{
- DocumentBuilderFactory factory
- = DocumentBuilderFactory.newInstance();
- XMLUtils.disableExternalEntities(factory);
document
- = factory.newDocumentBuilder()
+ = DocumentBuilderFactory.newInstance().newDocumentBuilder()
.parse(new ByteArrayInputStream(bytes));
}
catch (Exception e)