Fix crash when libxml set error in @autoreleasepool

- libxml will return first parsing error instead of last one
- option to replace lower ascii chars with whitespace
This commit is contained in:
relikd
2019-03-06 02:05:09 +01:00
parent f9a3c1c831
commit d9b6641a99
8 changed files with 124 additions and 16 deletions

View File

@@ -27,6 +27,8 @@
#import <libxml/parser.h>
#import "RSSAXParser.h"
const NSErrorDomain kLIBXMLParserErrorDomain = @"LIBXMLParserErrorDomain";
@interface RSSAXParser ()
@property (nonatomic, weak) id<RSSAXParserDelegate> delegate;
@@ -97,6 +99,8 @@ static xmlSAXHandler saxHandlerStruct;
*/
- (void)parseBytes:(const void *)bytes numberOfBytes:(NSUInteger)numberOfBytes {
_parsingError = nil;
if (self.context == nil) {
if (self.isHTMLParser) {
xmlCharEncoding characterEncoding = xmlDetectCharEncoding(bytes, (int)numberOfBytes);
@@ -342,6 +346,11 @@ static xmlSAXHandler saxHandlerStruct;
}
}
- (void)xmlParsingErrorOccured:(NSError*)error {
if (!self.parsingError) // grep first encountered error
_parsingError = error;
}
@end
@@ -369,6 +378,20 @@ static void endElementSAX_HTML(void *context, const xmlChar *localname) {
[(__bridge RSSAXParser *)context xmlEndHTMLElement:localname];
}
static void errorOccuredSAX(void *context, const char *format, ...) {
xmlErrorPtr err = xmlGetLastError();
if (err && err->level == XML_ERR_FATAL) {
int errCode = err->code;
char * msg = err->message;
NSString *errMsg = [[NSString stringWithFormat:@"%s", msg] stringByTrimmingCharactersInSet:
[NSCharacterSet whitespaceAndNewlineCharacterSet]];
NSError *error = [NSError errorWithDomain:kLIBXMLParserErrorDomain code:errCode
userInfo:@{ NSLocalizedDescriptionKey: errMsg }];
[(__bridge RSSAXParser *)context xmlParsingErrorOccured:error];
}
xmlResetLastError();
}
static xmlSAXHandler saxHandlerStruct = {
nil, /* internalSubset */
@@ -393,7 +416,7 @@ static xmlSAXHandler saxHandlerStruct = {
nil, /* processingInstruction */
nil, /* comment */
nil, /* warning */
nil, /* error */
errorOccuredSAX, /* error */
nil, /* fatalError //: unused error() get all the errors */
nil, /* getParameterEntity */
nil, /* cdataBlock */