aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/xml/xml.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-06-06 16:44:44 +0000
committerlambda <pleromagit@rogerbraun.net>2018-06-06 16:44:44 +0000
commit0a0c6bf3945d6da98d3e5a08205a9b4f24adb67f (patch)
treee442ad03e488eed433d8aecf8c1b079c74c9b019 /lib/pleroma/web/xml/xml.ex
parentb5d8213e701a525903f4ac6b0654fdb1ed68b300 (diff)
parent1620ec502c962557fa12fff2babd39eabe550493 (diff)
downloadpleroma-0a0c6bf3945d6da98d3e5a08205a9b4f24adb67f.tar.gz
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
webfinger robustness improvements See merge request pleroma/pleroma!195
Diffstat (limited to 'lib/pleroma/web/xml/xml.ex')
-rw-r--r--lib/pleroma/web/xml/xml.ex4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex
index 36430a3fa..da3f68ecb 100644
--- a/lib/pleroma/web/xml/xml.ex
+++ b/lib/pleroma/web/xml/xml.ex
@@ -32,6 +32,10 @@ defmodule Pleroma.Web.XML do
:exit, _error ->
Logger.debug("Couldn't parse XML: #{inspect(text)}")
:error
+ rescue
+ e ->
+ Logger.debug("Couldn't parse XML: #{inspect(text)}")
+ :error
end
end
end