Overview
| Comment: | Add some sanity checks to -[OFXMLElement initWithSerialization:]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
9b5a35bd98d72711e61a96d4a0c2bb75 |
| User & Date: | js on 2011-12-13 14:54:49 |
| Other Links: | manifest | tags |
Context
|
2011-12-13
| ||
| 15:01 | Add -[request:didCreateSocket:] to OFHTTPRequestDelegate. check-in: b02b668f81 user: js tags: trunk | |
| 14:54 | Add some sanity checks to -[OFXMLElement initWithSerialization:]. check-in: 9b5a35bd98 user: js tags: trunk | |
| 13:43 | Work around a bug affecting only Clang 2.9 + libobjc from GCC 4.6. check-in: 0c427ebb0a user: js tags: trunk | |
Changes
Modified src/OFXMLElement.m from [7304a0b96d] to [adc9e6f9aa].
| ︙ | ︙ | |||
284 285 286 287 288 289 290 291 292 293 294 295 296 297 |
{
self = [super init];
@try {
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFXMLElement *attributesElement, *namespacesElement;
OFXMLElement *childrenElement;
if (![[element name] isEqual: [self className]] ||
![[element namespace] isEqual: OF_SERIALIZATION_NS])
@throw [OFInvalidArgumentException
exceptionWithClass: isa
selector: _cmd];
| > > | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 |
{
self = [super init];
@try {
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFXMLElement *attributesElement, *namespacesElement;
OFXMLElement *childrenElement;
OFEnumerator *keyEnumerator, *objectEnumerator;
id key, object;
if (![[element name] isEqual: [self className]] ||
![[element namespace] isEqual: OF_SERIALIZATION_NS])
@throw [OFInvalidArgumentException
exceptionWithClass: isa
selector: _cmd];
|
| ︙ | ︙ | |||
310 311 312 313 314 315 316 | namespace: OF_SERIALIZATION_NS] elementsForNamespace: OF_SERIALIZATION_NS] firstObject]; childrenElement = [[[element elementForName: @"children" namespace: OF_SERIALIZATION_NS] elementsForNamespace: OF_SERIALIZATION_NS] firstObject]; | | > | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | namespace: OF_SERIALIZATION_NS] elementsForNamespace: OF_SERIALIZATION_NS] firstObject]; childrenElement = [[[element elementForName: @"children" namespace: OF_SERIALIZATION_NS] elementsForNamespace: OF_SERIALIZATION_NS] firstObject]; attributes = [[attributesElement objectByDeserializing] mutableCopy]; namespaces = [[namespacesElement objectByDeserializing] mutableCopy]; children = [[childrenElement objectByDeserializing] mutableCopy]; /* Sanity checks */ if ((attributes != nil && ![attributes isKindOfClass: [OFMutableArray class]]) || (namespaces != nil && ![namespaces isKindOfClass: [OFMutableDictionary class]]) || (children != nil && ![children isKindOfClass: [OFMutableArray class]])) @throw [OFInvalidArgumentException exceptionWithClass: isa selector: _cmd]; objectEnumerator = [attributes objectEnumerator]; while ((object = [objectEnumerator nextObject]) != nil) if (![object isKindOfClass: [OFXMLAttribute class]]) @throw [OFInvalidArgumentException exceptionWithClass: isa selector: _cmd]; keyEnumerator = [namespaces keyEnumerator]; objectEnumerator = [namespaces objectEnumerator]; while ((key = [keyEnumerator nextObject]) != nil && (object = [objectEnumerator nextObject]) != nil) if (![key isKindOfClass: [OFString class]] || ![object isKindOfClass: [OFString class]]) @throw [OFInvalidArgumentException exceptionWithClass: isa selector: _cmd]; objectEnumerator = [children objectEnumerator]; while ((object = [objectEnumerator nextObject]) != nil) if (![object isKindOfClass: [OFXMLNode class]]) @throw [OFInvalidArgumentException exceptionWithClass: isa selector: _cmd]; if (namespaces == nil) namespaces = [[OFMutableDictionary alloc] init]; [namespaces setObject: @"xml" forKey: @"http://www.w3.org/XML/1998/namespace"]; [namespaces setObject: @"xmlns" |
| ︙ | ︙ |