From df0421b216b62ff0156feeccf56e6f8da5e33023 Mon Sep 17 00:00:00 2001 From: rfm Date: Mon, 9 May 2011 11:35:00 +0000 Subject: [PATCH] tolerate missing/incorrect character encoding declarations git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33012 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSXMLParser.m | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 609dd0263..d616a2148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-09 Richard Frith-Macdonald + + * Source/NSXMLParser.m: treat unknown/undefined encodings as utf-8 + so we tolerate bad xml documents better. + 2011-05-02 Eric Wasylishen * Source/Additions/GSObjCRuntime.m (GSSelectorFromNameAndTypes): diff --git a/Source/NSXMLParser.m b/Source/NSXMLParser.m index 768b8aead..3af50a555 100644 --- a/Source/NSXMLParser.m +++ b/Source/NSXMLParser.m @@ -752,7 +752,9 @@ static SEL foundIgnorableSel; */ enc = [GSMimeDocument encodingFromCharset: [GSMimeDocument charsetForXml: data]]; - if (enc == NSUTF8StringEncoding || enc == NSASCIIStringEncoding) + if (enc == NSUTF8StringEncoding + || enc == NSASCIIStringEncoding + || enc == GSUndefinedEncoding) { this->data = [data copy]; }