gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix initialisation of NSUUID from string (permit mixed case hex digits)

Browse source
This commit is contained in:
Richard Frith-Macdonald 2020-12-15 10:40:55 +00:00
parent c1d98567a8
commit bcbdeb64a8
2 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Source/NSUUID.m
View file

@ -219,12 +219,34 @@ static int uuid_from_string(const char *string, unsigned char *uuid)
for (i = 0; i < kUUIDByteCount; i++)
{
char thisDigit[3];
int hi = unformatted[2*i];
int lo = unformatted[2*i+1];
thisDigit[0] = unformatted[2*i];
thisDigit[1] = unformatted[2*i+1];
thisDigit[2] = 0;
uuid[i] = strtoul(thisDigit, NULL, kUUIDByteCount);
if (isdigit(hi))
{
hi -= '0';
}
else if (isupper(hi))
{
hi = hi - 'A' + 10;
}
else
{
hi = hi - 'a' + 10;
}
if (isdigit(lo))
{
lo -= '0';
}
else if (isupper(lo))
{
lo = lo - 'A' + 10;
}
else
{
lo = lo - 'a' + 10;
}
uuid[i] = (hi << 4) | lo;
}
return 0;
}

8
Tests/base/NSUUID/basic.m
View file

@ -9,8 +9,9 @@ int main(int argc, char **argv)
NSAutoreleasePool *arp = [NSAutoreleasePool new];
NSUUID *uuid1, *uuid2;
NSString *uuidString = @"2139CD2E-15E6-4C37-84DA-1E18EEBFAB4A";
NSString *uuidStringLow = @"2139cd2e-15e6-4c37-84da-1e18eebfab4a";
gsuuid_t uuidBytes = { 0x80, 0x1f, 0x3a, 0x01, 0x95, 0x7c, 0x45, 0x0f,
uint8_t uuidBytes[] = { 0x80, 0x1f, 0x3a, 0x01, 0x95, 0x7c, 0x45, 0x0f,
0xaf, 0xf2, 0x1b, 0xe9, 0x59, 0xf5, 0x89, 0x54 };
TEST_FOR_CLASS(@"NSUUID", [NSUUID alloc],
@ -22,7 +23,10 @@ int main(int argc, char **argv)
PASS(uuid1 == nil, "Don't create a UUID from an invalid string");
uuid1 = [[NSUUID alloc] initWithUUIDString:uuidString];
PASS(uuid1 != nil, "Create a UUID from a valid string");
PASS(uuid1 != nil, "Create a UUID from a valid lowercase string");
uuid1 = [[NSUUID alloc] initWithUUIDString:uuidString];
PASS(uuid1 != nil, "Create a UUID from a valid uppercase string");
PASS_EQUAL([uuid1 UUIDString], uuidString,
"Derive a stable UUID string value");