[CalendarServer-changes] [2277] CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav /ical.py

[source_changes at macosforge.org]

Revision: 2277
          http://trac.macosforge.org/projects/calendarserver/changeset/2277
Author:   wsanchez at apple.com
Date:     2008-04-03 12:03:27 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Pulled up r2261 from trunk: reject invalid UTF-8 in iCalendar data

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/ical.py

Modified: CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/ical.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/ical.py	2008-04-02 22:16:04 UTC (rev 2276)
+++ CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/ical.py	2008-04-03 19:03:27 UTC (rev 2277)
@@ -208,7 +208,10 @@
             C{stream}.
         """
         try:
-            return clazz(None, vobject=readComponents(stream).next())
+            return clazz(None, vobject=readComponents(stream, findBegin=False).next())
+        except UnicodeDecodeError, e:
+            stream.seek(0)
+            raise ValueError("%s: %s" % (e, stream.read()))
         except vParseError, e:
             raise ValueError(e)
         except StopIteration, e:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080403/853c35dd/attachment.html