X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fxml%2Fxml.ex;h=b3ccf4a55b072bf7834c1679473c1e5c36420aec;hb=816db3f494c6fcc60d0a700dfc473a9cc49c84a0;hp=8b28a7e7d77f8a2bfde9a252b543d03149b501db;hpb=8d561f952fed2b2b4193f6586c865c877c1064ae;p=akkoma

diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex
index 8b28a7e7d..b3ccf4a55 100644
--- a/lib/pleroma/web/xml/xml.ex
+++ b/lib/pleroma/web/xml/xml.ex
@@ -2,23 +2,36 @@ defmodule Pleroma.Web.XML do
   require Logger
 
   def string_from_xpath(_, :error), do: nil
+
   def string_from_xpath(xpath, doc) do
-    {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
+    try do
+      {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
 
-    res = res
-    |> to_string
-    |> String.trim
+      res =
+        res
+        |> to_string
+        |> String.trim()
 
-    if res == "", do: nil, else: res
+      if res == "", do: nil, else: res
+    catch
+      _e ->
+        Logger.debug("Couldn't find xpath #{xpath} in XML doc")
+        nil
+    end
   end
 
   def parse_document(text) do
     try do
-      {doc, _rest} = text
-      |> :binary.bin_to_list
-      |> :xmerl_scan.string
+      {doc, _rest} =
+        text
+        |> :binary.bin_to_list()
+        |> :xmerl_scan.string(quiet: true)
 
       doc
+    rescue
+      _e ->
+        Logger.debug("Couldn't parse XML: #{inspect(text)}")
+        :error
     catch
       :exit, _error ->
         Logger.debug("Couldn't parse XML: #{inspect(text)}")