ObjFW  Diff

Differences From Artifact [fb863141bc]:

To Artifact [5ac96ead53]:


22
23
24
25
26
27
28
29

30
31
32


33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49























50

51
52
53
54
55
56

57
58
59
60
61
















62
63
64
65
66
67
68
69
70
71
72
73
74
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
110
111
112
113
114
115
22
23
24
25
26
27
28

29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74

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
110
111
112
113
114
115
116
117
118
119
120

121
122
123
124
125
126

127
128
129
130
131
132

133
134
135
136
137
138

139
140
141
142
143
144

145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
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







-
+



+
+

















+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+





-
+





+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


















-
+





-
+





-
+





-
+





-
+




+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+







 *
 * We already have a clue about how big the resulting string will get, so we
 * can prealloc and only resize when really necessary - OFString would always
 * resize when we append, which would be slow here.
 */

static inline BOOL
xmlfactory_resize(char **str, size_t *len, size_t add)
xf_resize_chars(char **str, size_t *len, size_t add)
{
	char *str2;
	size_t len2;

	/* FIXME: Check for overflows on add */

	len2 = *len + add;
	
	if ((str2 = realloc(*str, len2)) == NULL) {
		if (*str)
			free(*str);
		*str = NULL;
		return NO;
	}

	*str = str2;
	*len = len2;

	return YES;
}

static inline BOOL
xf_resize_wchars(wchar_t **str, size_t *len, size_t add)
{
	wchar_t *str2;
	size_t len2;

	/* FIXME: Check for overflows on add and multiply */

	len2 = *len + add;
	
	if ((str2 = realloc(*str, len2 * sizeof(wchar_t))) == NULL) {
		if (*str)
			free(*str);
		*str = NULL;
		return NO;
	}

	*str = str2;
	*len = len2;

	return YES;
}

static inline BOOL
xmlfactory_add2str(char **str, size_t *len, size_t *pos, const char *add)
xf_add2chars(char **str, size_t *len, size_t *pos, const char *add)
{
	size_t add_len;

	add_len = strlen(add);

	if (!xmlfactory_resize(str, len, add_len))
	if (!xf_resize_chars(str, len, add_len))
		return NO;

	memcpy(*str + *pos, add, add_len);
	*pos += add_len;

	return YES;
}

static inline BOOL
xf_add2wchars(wchar_t **str, size_t *len, size_t *pos, const wchar_t *add)
{
	size_t add_len;

	add_len = wcslen(add);

	if (!xf_resize_wchars(str, len, add_len))
		return NO;

	wmemcpy(*str + *pos, add, add_len);
	*pos += add_len;

	return YES;
}

@implementation OFXMLFactory
+ (char*)escapeCString: (const char*)s
{
	char *ret;
	size_t i, j, len, nlen;

	len = nlen = strlen(s);

	if ((ret = malloc(len + 1)) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: len + 1] raise];

	for (i = j = 0; i < len; i++) {
		switch (s[i]) {
		case '<':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&lt;"))
			if (!xf_add2chars(&ret, &nlen, &j, "&lt;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 4]
				    raise];
			break;
		case '>':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&gt;"))
			if (!xf_add2chars(&ret, &nlen, &j, "&gt;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 4]
				    raise];
			break;
		case '"':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&quot;"))
			if (!xf_add2chars(&ret, &nlen, &j, "&quot;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 6]
				    raise];
			break;
		case '\'':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&apos;"))
			if (!xf_add2chars(&ret, &nlen, &j, "&apos;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 6]
				    raise];
			break;
		case '&':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&amp;"))
			if (!xf_add2chars(&ret, &nlen, &j, "&amp;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 5]
				    raise];
			break;
		default:
			ret[j++] = s[i];
			break;
		}
	}

	ret[j] = 0;
	return ret;
}

+ (wchar_t*)escapeWideCString: (const wchar_t*)s
{
	wchar_t *ret;
	size_t i, j, len, nlen;

	len = nlen = wcslen(s);

	/* FIXME: Check for overflow in multiply */
	if ((ret = malloc((len + 1) * sizeof(wchar_t))) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: (len + 1) * sizeof(wchar_t)]
		     raise];

	for (i = j = 0; i < len; i++) {
		switch (s[i]) {
		case L'<':
			if (!xf_add2wchars(&ret, &nlen, &j, L"&lt;"))
				[[OFNoMemException newWithObject: nil
							 andSize: (nlen + 4) *
								  sizeof(
								  wchar_t)]
				    raise];
			break;
		case L'>':
			if (!xf_add2wchars(&ret, &nlen, &j, L"&gt;"))
				[[OFNoMemException newWithObject: nil
							 andSize: (nlen + 4) *
								  sizeof(
								  wchar_t)]
				    raise];
			break;
		case L'"':
			if (!xf_add2wchars(&ret, &nlen, &j, L"&quot;"))
				[[OFNoMemException newWithObject: nil
							 andSize: (nlen + 6) *
								  sizeof(
								  wchar_t)]
				    raise];
			break;
		case L'\'':
			if (!xf_add2wchars(&ret, &nlen, &j, L"&apos;"))
				[[OFNoMemException newWithObject: nil
							 andSize: (nlen + 6) *
								  sizeof(
								  wchar_t)]
				    raise];
			break;
		case L'&':
			if (!xf_add2wchars(&ret, &nlen, &j, L"&amp;"))
				[[OFNoMemException newWithObject: nil
							 andSize: (nlen + 5) *
								  sizeof(
								  wchar_t)]
				    raise];
			break;
		default:
			ret[j++] = s[i];
			break;
		}
	}

	ret[j] = 0;
146
147
148
149
150
151
152
153

154
155
156
157
158
159
160
252
253
254
255
256
257
258

259
260
261
262
263
264
265
266







-
+







			 * escapeCString already throws an exception,
			 * no need to throw a second one here.
			 */
			free(xml);
			return NULL;
		}

		if (!xmlfactory_resize(&xml, &len, 1 + strlen(arg) + 2 +
		if (!xf_resize_chars(&xml, &len, 1 + strlen(arg) + 2 +
		    strlen(esc_val) + 1)) {
			free(esc_val);
			[[OFNoMemException newWithObject: nil
						 andSize: len + 1 +
							  strlen(arg) + 2 +
							  strlen(esc_val) + 1]
			    raise];
172
173
174
175
176
177
178
179

180
181
182
183
184
185
186
187

188
189
190
191
192
193
194
278
279
280
281
282
283
284

285
286
287
288
289
290
291
292

293
294
295
296
297
298
299
300







-
+







-
+







		free(esc_val);
	}
	va_end(args);

	/* End of tag */
	if (close) {
		if (data == NULL) {
			if (!xmlfactory_resize(&xml, &len, 2 - 1))
			if (!xf_resize_chars(&xml, &len, 2 - 1))
				[[OFNoMemException newWithObject: nil
							 andSize: len + 2 - 1]
				    raise];
	
			xml[i++] = '/';
			xml[i++] = '>';
		} else {
			if (!xmlfactory_resize(&xml, &len, 1 + strlen(data) +
			if (!xf_resize_chars(&xml, &len, 1 + strlen(data) +
			    2 + strlen(name) + 1 - 1))
				[[OFNoMemException newWithObject: nil
							 andSize: len + 1 +
								  strlen(data) +
								  2 +
								  strlen(name) +
								  1 - 1]
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
239
240
241
242
243
244
245
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
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
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
417
418

419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436

437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487







+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

















-
+






+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+








	} else
		xml[i++] = '>';

	xml[i] = 0;
	return xml;
}

+ (wchar_t*)createWideStanza: (const wchar_t*)name
		withCloseTag: (BOOL)close
		     andData: (const wchar_t*)data, ...
{
	wchar_t *arg, *val, *xml;
	size_t i, len;
	va_list args;

	/* Start of tag */
	len = wcslen(name) + 3;
	/* TODO: Check for multiply overflow */
	if ((xml = malloc(len * sizeof(wchar_t*))) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: len * sizeof(wchar_t)] raise];

	i = 0;
	xml[i++] = L'<';
	wmemcpy(xml + i, name, wcslen(name));
	i += wcslen(name);

	/* Arguments */
	va_start(args, data);
	while ((arg = va_arg(args, wchar_t*)) != NULL &&
	    (val = va_arg(args, wchar_t*)) != NULL) {
		wchar_t *esc_val;

		if ((esc_val = [OFXMLFactory escapeWideCString: val]) == NULL) {
			/*
			 * escapeWideCString already throws an exception,
			 * no need to throw a second one here.
			 */
			free(xml);
			return NULL;
		}

		if (!xf_resize_wchars(&xml, &len, 1 + wcslen(arg) + 2 +
		    wcslen(esc_val) + 1)) {
			free(esc_val);
			[[OFNoMemException newWithObject: nil
						 andSize: (len + 1 +
							  wcslen(arg) + 2 +
							  wcslen(esc_val) + 1) *
							  sizeof(wchar_t)]
			    raise];
		}

		xml[i++] = L' ';
		wmemcpy(xml + i, arg, wcslen(arg));
		i += wcslen(arg);
		xml[i++] = L'=';
		xml[i++] = L'\'';
		wmemcpy(xml + i, esc_val, wcslen(esc_val));
		i += wcslen(esc_val);
		xml[i++] = L'\'';

		free(esc_val);
	}
	va_end(args);

	/* End of tag */
	if (close) {
		if (data == NULL) {
			if (!xf_resize_wchars(&xml, &len, 2 - 1))
				[[OFNoMemException newWithObject: nil
							 andSize: (len + 2
								  - 1) * sizeof(
								  wchar_t)]
				    raise];
	
			xml[i++] = L'/';
			xml[i++] = L'>';
		} else {
			if (!xf_resize_wchars(&xml, &len, 1 + wcslen(data) +
			    2 + wcslen(name) + 1 - 1))
				[[OFNoMemException newWithObject: nil
							 andSize: (len + 1 +
								  wcslen(data) +
								  2 +
								  wcslen(name) +
								  1 -
								  1) * sizeof(
								  wchar_t)]
				    raise];
	
			xml[i++] = L'>';
			wmemcpy(xml + i, data, wcslen(data));
			i += wcslen(data);
			xml[i++] = L'<';
			xml[i++] = L'/';
			wmemcpy(xml + i, name, wcslen(name));
			i += wcslen(name);
			xml[i++] = L'>';
		}
	} else
		xml[i++] = L'>';

	xml[i] = 0;
	return xml;
}

+ (char*)concatAndFreeCStrings: (char **)strs
+ (char*)concatAndFreeCStrings: (char**)strs
{
	char *ret;
	size_t i, len, pos;

	if (strs[0] == NULL)
		return NULL;

	len = strlen(*strs) + 1;
	
	if ((ret = malloc(len)) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: len] raise];

	memcpy(ret, strs[0], len - 1);
	pos = len - 1;

	for (i = 1; strs[i] != NULL; i++) {
		if (!xmlfactory_add2str(&ret, &len, &pos, strs[i])) {
		if (!xf_add2chars(&ret, &len, &pos, strs[i])) {
			free(ret);
			[[OFNoMemException newWithObject: nil
						 andSize: len + strlen(strs[i])]
			    raise];
		}
	}

	for (i = 0; strs[i] != NULL; i++)
		free(strs[i]);

	ret[pos] = 0;
	return ret;
}

+ (wchar_t*)concatAndFreeWideCStrings: (wchar_t**)strs
{
	wchar_t *ret;
	size_t i, len, pos;

	if (strs[0] == NULL)
		return NULL;

	len = wcslen(*strs) + 1;
	
	/* FIXME: Check for overflow on multiply */
	if ((ret = malloc(len * sizeof(wchar_t))) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: len * sizeof(wchar_t)] raise];

	wmemcpy(ret, strs[0], len - 1);
	pos = len - 1;

	for (i = 1; strs[i] != NULL; i++) {
		if (!xf_add2wchars(&ret, &len, &pos, strs[i])) {
			free(ret);
			[[OFNoMemException newWithObject: nil
						 andSize: (wcslen(strs[i]) +
							  len) * sizeof(
							  wchar_t)]
			    raise];
		}
	}

	for (i = 0; strs[i] != NULL; i++)
		free(strs[i]);

	ret[pos] = 0;
	return ret;
}
@end