ObjFW  Diff

Differences From Artifact [966d2aeae2]:

• File src/OFString+XMLUnescaping.m — part of check-in [b5c8b62533] at 2014-07-06 11:04:57 on branch trunk — OFString+*.m: Add a few missing autorelease pools

  Those were only a problem if the user created its own OFString subclass,
  as calls to -[UTF8String] could then create a new, autoreleased C
  string. As OFString_UTF8 simply returns the internal C string, this
  hasn't been a problem when not subclassing OFString. (user: js, size: 5017) [annotate] [blame] [check-ins using]

To Artifact [8b7d306c79]:

• File src/OFString+XMLUnescaping.m — part of check-in [6e5a920567] at 2014-07-07 22:05:11 on branch trunk — Add OFUnknownXMLEntityException

  Additionally, OFXMLParser now uses OFMalformedXMLException instead of
  OFInvalidFormatException on invalid entities. (user: js, size: 5080) [annotate] [blame] [check-ins using]

17
18
19
20
21
22
23

24
25
26
27
28
29
30

#include "config.h"

#include <string.h>

#import "OFString.h"

#import "OFInvalidFormatException.h"


int _OFString_XMLUnescaping_reference;

static OF_INLINE OFString*
parseNumericEntity(const char *entity, size_t length)
{
	of_unichar_t c;

>

17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

#include "config.h"

#include <string.h>

#import "OFString.h"

#import "OFInvalidFormatException.h"
#import "OFUnknownXMLEntityException.h"

int _OFString_XMLUnescaping_reference;

static OF_INLINE OFString*
parseNumericEntity(const char *entity, size_t length)
{
	of_unichar_t c;

149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164

				name = [OFString
				    stringWithUTF8String: entity
						  length: entityLength];
				tmp = lookup(context, self, name);

				if (tmp == nil)
					@throw [OFInvalidFormatException
					    exception];

				[ret appendString: tmp];
				objc_autoreleasePoolPop(pool);
			}

			last = i + 1;
			inEntity = false;

|
|

150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165

				name = [OFString
				    stringWithUTF8String: entity
						  length: entityLength];
				tmp = lookup(context, self, name);

				if (tmp == nil)
					@throw [OFUnknownXMLEntityException
					    exceptionWithEntityName: name];

				[ret appendString: tmp];
				objc_autoreleasePoolPop(pool);
			}

			last = i + 1;
			inEntity = false;