banshee r4103 - in trunk/banshee: . src/Libraries/Migo/Migo.Syndication

[gburt svn gnome org]

Author: gburt
Date: Wed Jun  4 00:25:28 2008
New Revision: 4103
URL: http://svn.gnome.org/viewvc/banshee?rev=4103&view=rev

Log:
2008-06-03  Gabriel Burt  <gabriel burt gmail com>

	* src/Libraries/Migo/Migo.Syndication/RssParser.cs: If we fail to load a
	XML document b/c it's invalid, remove any non-linebreak control
	characters from it and try loading it again.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Migo/Migo.Syndication/RssParser.cs

Modified: trunk/banshee/src/Libraries/Migo/Migo.Syndication/RssParser.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo.Syndication/RssParser.cs	(original)
+++ trunk/banshee/src/Libraries/Migo/Migo.Syndication/RssParser.cs	Wed Jun  4 00:25:28 2008
@@ -30,6 +30,7 @@
 
 using System;
 using System.Xml;
+using System.Text;
 using System.Collections.Generic;
 
 namespace Migo.Syndication
@@ -45,8 +46,30 @@
             try {
                 doc.LoadXml (xml);
             } catch (XmlException e) {
-                Hyena.Log.Exception (e);
-                throw new FormatException ("Invalid XML document.");                                  
+                bool have_stripped_control = false;
+                StringBuilder sb = new StringBuilder ();
+
+                foreach (char c in xml) {
+                    if (Char.IsControl (c) && c != '\n') {
+                        have_stripped_control = true;
+                    } else {
+                        sb.Append (c);
+                    }
+                }
+
+                bool loaded = false;
+                if (have_stripped_control) {
+                    try {
+                        doc.LoadXml (sb.ToString ());
+                        loaded = true;
+                    } catch (Exception) {
+                    }
+                }
+
+                if (!loaded) {
+                    Hyena.Log.Exception (e);
+                    throw new FormatException ("Invalid XML document.");                                  
+                }
             }
             CheckRss ();
         }