X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fxml%2Fxml.ex;h=fa6dcd424ca522d4b5a28ecc61b4f6e37ffb839c;hb=286632dfa224f8b49cc8656a29efe17f4e2219a1;hp=026672ad12fb4f7030e74eb56699f7008171889b;hpb=30e9b22f96f2bf1cd895e993190f40afba159bb6;p=akkoma

diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex
index 026672ad1..fa6dcd424 100644
--- a/lib/pleroma/web/xml/xml.ex
+++ b/lib/pleroma/web/xml/xml.ex
@@ -1,27 +1,44 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 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)}")
+        Logger.debug("Couldn't parse XML: #{inspect(text)}")
         :error
     end
   end