Overview
Comment: | More checking for malformed/invalid XML. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
a70d90b09e599ef9aa57f1da5d93409f |
User & Date: | js on 2009-08-10 18:37:30 |
Other Links: | manifest | tags |
Context
2009-08-12
| ||
15:37 | Rename +[name] and -[name] to +[className] and -[className]. check-in: ce8d36d5c4 user: js tags: trunk | |
2009-08-10
| ||
18:37 | More checking for malformed/invalid XML. check-in: a70d90b09e user: js tags: trunk | |
18:25 | Correctly handle lastObject / lastItem if the array is empty. check-in: bc012259a9 user: js tags: trunk | |
Changes
Modified src/OFExceptions.h from [16ecb98c6a] to [fa5104c9e6].
︙ | ︙ | |||
207 208 209 210 211 212 213 214 215 216 217 218 219 220 | /** * An OFException indicating that the format is invalid. */ @interface OFInvalidFormatException: OFException {} @end /** * An OFException indicating that initializing something failed. */ @interface OFInitializationFailedException: OFException {} @end /** | > > > > > > | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | /** * An OFException indicating that the format is invalid. */ @interface OFInvalidFormatException: OFException {} @end /** * An OFException indicating that a parser encountered malformed or invalid XML. */ @interface OFMalformedXMLException: OFException {} @end /** * An OFException indicating that initializing something failed. */ @interface OFInitializationFailedException: OFException {} @end /** |
︙ | ︙ |
Modified src/OFExceptions.m from [59e1e06f15] to [77e5ffdd0d].
︙ | ︙ | |||
297 298 299 300 301 302 303 304 305 306 307 308 309 310 | { if (string != nil) return string; string = [[OFString alloc] initWithFormat: @"The format is invalid for class %s!", [class name]]; return string; } @end @implementation OFInitializationFailedException - (OFString*)string { | > > > > > > > > > > > > > > | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | { if (string != nil) return string; string = [[OFString alloc] initWithFormat: @"The format is invalid for class %s!", [class name]]; return string; } @end @implementation OFMalformedXMLException - (OFString*)string { if (string != nil) return string; string = [[OFString alloc] initWithFormat: @"The parser in class %s encountered malformed or invalid XML!", [class name]]; return string; } @end @implementation OFInitializationFailedException - (OFString*)string { |
︙ | ︙ |
Modified src/OFXMLParser.h from [b01ef202a5] to [badfb4ea20].
︙ | ︙ | |||
55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | OFString *cache; OFString *name; OFString *prefix; OFString *ns; OFDictionary *attrs; OFString *attr_name; char delim; } + xmlParser; - (id)delegate; - setDelegate: (OFObject <OFXMLParserDelegate>*)delegate; - parseBuffer: (const char*)buf withSize: (size_t)size; @end @interface OFString (OFXMLUnescaping) - stringByXMLUnescaping; - stringByXMLUnescapingWithHandler: (OFObject <OFXMLUnescapingDelegate>*)h; @end | > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | OFString *cache; OFString *name; OFString *prefix; OFString *ns; OFDictionary *attrs; OFString *attr_name; char delim; OFArray *previous; } + xmlParser; - (id)delegate; - setDelegate: (OFObject <OFXMLParserDelegate>*)delegate; - parseBuffer: (const char*)buf withSize: (size_t)size; @end @interface OFString (OFXMLUnescaping) - stringByXMLUnescaping; - stringByXMLUnescapingWithHandler: (OFObject <OFXMLUnescapingDelegate>*)h; @end |
Modified src/OFXMLParser.m from [ee7d38a3f9] to [c9bc88e2c8].
︙ | ︙ | |||
75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | - init { self = [super init]; @try { cache = [[OFMutableString alloc] init]; } @catch (OFException *e) { /* We can't use [super dealloc] on OS X here. Compiler bug? */ [self dealloc]; @throw e; } return self; } - (void)dealloc { [delegate release]; [cache release]; [name release]; [prefix release]; [ns release]; [attrs release]; [attr_name release]; [super dealloc]; } - (id)delegate { return [[delegate retain] autorelease]; | > > | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | - init { self = [super init]; @try { cache = [[OFMutableString alloc] init]; previous = [[OFMutableArray alloc] init]; } @catch (OFException *e) { /* We can't use [super dealloc] on OS X here. Compiler bug? */ [self dealloc]; @throw e; } return self; } - (void)dealloc { [delegate release]; [cache release]; [name release]; [prefix release]; [ns release]; [attrs release]; [attr_name release]; [previous release]; [super dealloc]; } - (id)delegate { return [[delegate retain] autorelease]; |
︙ | ︙ | |||
192 193 194 195 196 197 198 | } else { prefix = nil; name = [[OFString alloc] initWithCString: cache_c length: cache_len]; } | < < > > > > | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | } else { prefix = nil; name = [[OFString alloc] initWithCString: cache_c length: cache_len]; } if (buf[i] == '>' || buf[i] == '/') { pool = [[OFAutoreleasePool alloc] init]; [delegate xmlParser: self didStartTagWithName: name prefix: prefix namespace: ns attributes: nil]; if (buf[i] == '/') [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; [ns release]; state = (buf[i] == '/' ? OF_XMLPARSER_EXPECT_CLOSE : OF_XMLPARSER_OUTSIDE_TAG); } else state = OF_XMLPARSER_IN_TAG; [cache setToCString: ""]; last = i + 1; } break; /* Inside a close tag, no name yet */ case OF_XMLPARSER_IN_CLOSE_TAG_NAME: if (buf[i] == ' ' || buf[i] == '>') { |
︙ | ︙ | |||
253 254 255 256 257 258 259 260 261 262 263 264 265 266 | cache_c) - 1]; } else { prefix = nil; name = [[OFString alloc] initWithCString: cache_c length: cache_len]; } [cache setToCString: ""]; pool = [[OFAutoreleasePool alloc] init]; [delegate xmlParser: self didEndTagWithName: name | > > > > > | 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | cache_c) - 1]; } else { prefix = nil; name = [[OFString alloc] initWithCString: cache_c length: cache_len]; } if (![[previous lastObject] isEqual: cache]) @throw [OFMalformedXMLException newWithClass: isa]; [previous removeNObjects: 1]; [cache setToCString: ""]; pool = [[OFAutoreleasePool alloc] init]; [delegate xmlParser: self didEndTagWithName: name |
︙ | ︙ | |||
292 293 294 295 296 297 298 299 300 301 302 303 304 305 | attributes: attrs]; if (buf[i] == '/') [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; [pool release]; [name release]; [prefix release]; [ns release]; [attrs release]; | > > > > > > > > | 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 | attributes: attrs]; if (buf[i] == '/') [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; else if (prefix != nil) { OFString *str = [OFString stringWithFormat: @"%s:%s", [prefix cString], [name cString]]; [previous addObject: str]; } else [previous addObject: name]; [pool release]; [name release]; [prefix release]; [ns release]; [attrs release]; |
︙ | ︙ | |||
332 333 334 335 336 337 338 | state = OF_XMLPARSER_EXPECT_DELIM; } break; /* Expecting delimiter */ case OF_XMLPARSER_EXPECT_DELIM: if (buf[i] != '\'' && buf[i] != '"') | | | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | state = OF_XMLPARSER_EXPECT_DELIM; } break; /* Expecting delimiter */ case OF_XMLPARSER_EXPECT_DELIM: if (buf[i] != '\'' && buf[i] != '"') @throw [OFMalformedXMLException newWithClass: isa]; delim = buf[i]; last = i + 1; state = OF_XMLPARSER_IN_ATTR_VALUE; break; |
︙ | ︙ | |||
375 376 377 378 379 380 381 | /* Expecting closing '>' */ case OF_XMLPARSER_EXPECT_CLOSE: if (buf[i] == '>') { last = i + 1; state = OF_XMLPARSER_OUTSIDE_TAG; } else | | | | 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 | /* Expecting closing '>' */ case OF_XMLPARSER_EXPECT_CLOSE: if (buf[i] == '>') { last = i + 1; state = OF_XMLPARSER_OUTSIDE_TAG; } else @throw [OFMalformedXMLException newWithClass: isa]; break; /* Expecting closing '>' or space */ case OF_XMLPARSER_EXPECT_SPACE_OR_CLOSE: if (buf[i] == '>') { last = i + 1; state = OF_XMLPARSER_OUTSIDE_TAG; } else if (buf[i] != ' ') @throw [OFMalformedXMLException newWithClass: isa]; break; } } len = size - last; /* In OF_XMLPARSER_IN_TAG, there can be only spaces */ |
︙ | ︙ |
Modified tests/OFXMLParser/OFXMLParser.m from [5db627fdbd] to [82a296dd2e].
︙ | ︙ | |||
79 80 81 82 83 84 85 | } @end int main() { const char *foo = "bar<foo:bar bar='b&az' qux=\"quux\">foo<bar" | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | } @end int main() { const char *foo = "bar<foo:bar bar='b&az' qux=\"quux\">foo<bar" "<qux >bar<baz name='' test='&foo;'/>quxbar</qux></foo:bar>"; size_t len = strlen(foo); size_t i; OFXMLParser *parser = [OFXMLParser xmlParser]; [parser setDelegate: [[ParserDelegate alloc] init]]; /* Simulate a stream where we only get chunks */ |
︙ | ︙ |