Differences From Artifact [69877c8b33]:
- File src/OFUTF8String.m — part of check-in [d6a8d57148] at 2024-08-24 22:19:53 on branch trunk — OFString: Fix converting from some encodings (user: js, size: 28868) [annotate] [blame] [check-ins using]
To Artifact [eb22322b98]:
- File
src/OFUTF8String.m
— part of check-in
[82c5846734]
at
2024-08-24 23:41:16
on branch trunk
— Don't assume all custom string classes use Unicode
Initially, isUTF8 was set to true for all custom string classes because
having isUTF8 set to false was merely an optimization. However,
-[OFUTF8String cStringWithEncoding: OFStringEncodingASCII] throws an
exception when isUTF8 is true. (user: js, size: 29042) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
456 457 458 459 460 461 462 |
{
self = [super init];
@try {
_s = &_storage;
_s->cStringLength = string.UTF8StringLength;
| < < < < < < < > > > > > > > > > > > > > > | 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 488 |
{
self = [super init];
@try {
_s = &_storage;
_s->cStringLength = string.UTF8StringLength;
_s->length = string.length;
_s->cString = OFAllocMemory(_s->cStringLength + 1, 1);
memcpy(_s->cString, string.UTF8String, _s->cStringLength + 1);
_s->freeWhenDone = true;
if ([string isKindOfClass: [OFUTF8String class]] ||
[string isKindOfClass: [OFMutableUTF8String class]])
_s->isUTF8 = ((OFUTF8String *)string)->_s->isUTF8;
else {
switch (_OFUTF8StringCheck(_s->cString,
_s->cStringLength, NULL)) {
case 1:
_s->isUTF8 = true;
break;
case -1:
@throw [OFInvalidEncodingException exception];
}
}
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
|
| ︙ | ︙ |