External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-06 00:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/xml.c: fix virParseUUID()

Browse Source 
Daniel
This commit is contained in:
Daniel Veillard 2006-08-17 18:39:32 +00:00
parent 6d1ef709cc
commit adec25590c
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Aug 17 19:42:50 CEST 2006 Daniel Veillard <veillard@redhat.com>
* src/xml.c: fix virParseUUID()
Wed Aug 16 19:07:52 CEST 2006 Daniel Veillard <veillard@redhat.com> Wed Aug 16 19:07:52 CEST 2006 Daniel Veillard <veillard@redhat.com>
* NEWS configure.in doc//* include/libvirt/libvirt.h * NEWS configure.in doc//* include/libvirt/libvirt.h

77
src/xml.c
View File

@ -1254,53 +1254,50 @@ virDomainParseXMLDesc(const char *xmldesc, char **name)
unsigned char *virParseUUID(char **ptr, const char *uuid) { unsigned char *virParseUUID(char **ptr, const char *uuid) {
int rawuuid[16]; int rawuuid[16];
const char *cur;
unsigned char *dst_uuid = NULL; unsigned char *dst_uuid = NULL;
int ret;
int i; int i;
memset(rawuuid, 0xFF, sizeof(rawuuid));
if (uuid == NULL) if (uuid == NULL)
goto error; goto error;
ret = sscanf(uuid, /*
"%02x%02x%02x%02x" * do a liberal scan allowing '-' and ' ' anywhere between character
"%02x%02x%02x%02x" * pairs as long as there is 32 of them in the end.
"%02x%02x%02x%02x" */
"%02x%02x%02x%02x", cur = uuid;
rawuuid + 0, rawuuid + 1, rawuuid + 2, rawuuid + 3, for (i = 0;i < 16;) {
rawuuid + 4, rawuuid + 5, rawuuid + 6, rawuuid + 7, rawuuid[i] = 0;
rawuuid + 8, rawuuid + 9, rawuuid + 10, rawuuid + 11, if (*cur == 0)
rawuuid + 12, rawuuid + 13, rawuuid + 14, rawuuid + 15);
if (ret == 16)
goto done;
ret = sscanf(uuid,
"%02x%02x%02x%02x-"
"%02x%02x-"
"%02x%02x-"
"%02x%02x-"
"%02x%02x%02x%02x%02x%02x",
rawuuid + 0, rawuuid + 1, rawuuid + 2, rawuuid + 3,
rawuuid + 4, rawuuid + 5, rawuuid + 6, rawuuid + 7,
rawuuid + 8, rawuuid + 9, rawuuid + 10, rawuuid + 11,
rawuuid + 12, rawuuid + 13, rawuuid + 14, rawuuid + 15);
if (ret == 16)
goto done;
ret = sscanf(uuid,
"%02x%02x%02x%02x-"
"%02x%02x%02x%02x-"
"%02x%02x%02x%02x-"
"%02x%02x%02x%02x",
rawuuid + 0, rawuuid + 1, rawuuid + 2, rawuuid + 3,
rawuuid + 4, rawuuid + 5, rawuuid + 6, rawuuid + 7,
rawuuid + 8, rawuuid + 9, rawuuid + 10, rawuuid + 11,
rawuuid + 12, rawuuid + 13, rawuuid + 14, rawuuid + 15);
if (ret != 16)
goto error; goto error;
if ((*cur == '-') || (*cur == ' ')) {
cur++;
continue;
}
if ((*cur >= '0') && (*cur <= '9'))
rawuuid[i] = *cur - '0';
else if ((*cur >= 'a') && (*cur <= 'f'))
rawuuid[i] = *cur - 'a' + 10;
else if ((*cur >= 'A') && (*cur <= 'F'))
rawuuid[i] = *cur - 'A' + 10;
else
goto error;
rawuuid[i] *= 16;
cur++;
if (*cur == 0)
goto error;
if ((*cur >= '0') && (*cur <= '9'))
rawuuid[i] += *cur - '0';
else if ((*cur >= 'a') && (*cur <= 'f'))
rawuuid[i] += *cur - 'a' + 10;
else if ((*cur >= 'A') && (*cur <= 'F'))
rawuuid[i] += *cur - 'A' + 10;
else
goto error;
i++;
cur++;
}
done:
dst_uuid = (unsigned char *) *ptr; dst_uuid = (unsigned char *) *ptr;
*ptr += 16; *ptr += 16;
@ -1308,5 +1305,5 @@ unsigned char *virParseUUID(char **ptr, const char *uuid) {
dst_uuid[i] = rawuuid[i] & 0xFF; dst_uuid[i] = rawuuid[i] & 0xFF;
error: error:
return dst_uuid; return(dst_uuid);
} }