ObjFW  Diff

Differences From Artifact [04afab8da6]:

• File src/OFString.m — part of check-in [8e8bb78eb5] at 2011-05-01 12:43:18 on branch trunk — Correctly set isUTF8 in -[OFString initWithUnicodeString:]. (user: js, size: 33840) [annotate] [blame] [check-ins using]

To Artifact [f44982b7c8]:

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

1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602

	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;

|

1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602

	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;