ObjFW  Diff

Differences From Artifact [d61077ef08]:

• File src/OFString.m — part of check-in [abff9ac184] at 2011-04-25 14:14:49 on branch 0.5 — Fix a warning when sizeof(size_t) < sizeof(long long). (user: js, size: 29395) [annotate] [blame] [check-ins using]

To Artifact [ada3b84c8f]:

• File src/OFString.m — part of check-in [4a9e45c2ad] at 2011-05-01 23:42:24 on branch 0.5 — Fix a possible out-of-bounds read in -[OFString unicodeString]. (user: js, size: 29395) [annotate] [blame] [check-ins using]

1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430

	i = j = 0;

	while (i < length) {
		of_unichar_t c;
		size_t clen;

		clen = of_string_utf8_to_unicode(string + i, length - 1, &c);

		if (clen == 0 || c > 0x10FFFF) {
			free(ret);
			@throw [OFInvalidEncodingException newWithClass: isa];
		}

		ret[j++] = c;

|

1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430

	i = j = 0;

	while (i < length) {
		of_unichar_t c;
		size_t clen;

		clen = of_string_utf8_to_unicode(string + i, length - i, &c);

		if (clen == 0 || c > 0x10FFFF) {
			free(ret);
			@throw [OFInvalidEncodingException newWithClass: isa];
		}

		ret[j++] = c;