ObjFW  Diff

Differences From Artifact [fb7ee6732e]:

• File src/OFString.m — part of check-in [7b7250a0ba] at 2011-05-01 23:58:26 on branch trunk — Autorelease the return value of -[unicodeString] and include a BOM. (user: js, size: 33874) [annotate] [blame] [check-ins using]

To Artifact [b56b81b94d]:

• File src/OFString.m — part of check-in [3a1cd610ed] at 2011-05-02 13:01:59 on branch trunk — Don't free ret in -[unicodeString] as it is autoreleased now. (user: js, size: 33854) [annotate] [blame] [check-ins using]

1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609

	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;
		i += cLen;
	}

	ret[j] = 0;

|
<

<

1592
1593
1594
1595
1596
1597
1598
1599

1600

1601
1602
1603
1604
1605
1606
1607

	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)

			@throw [OFInvalidEncodingException newWithClass: isa];


		ret[j++] = c;
		i += cLen;
	}

	ret[j] = 0;