Bug 45412 – Fix a problem in createCanonicalUUIDString that causes the last digit missing on Linux

• Component: WebCore JavaScript
• Status: RESOLVED FIXED

[Jian Li]

Fix a problem in createCanonicalUUIDString that causes the last digit missing on Linux

[Jian Li]

Created attachment 66940 [details]
Proposed Patch

[Darin Adler]

Comment on attachment 66940 [details]
Proposed Patch

>      char uuidStr[37] = {0};

There's no reason to initialize this. The fgets function will fill in the array including adding the '\0' terminator if it succeeds. And if it fails we don’t look at the array in our code.

[Darin Adler]

Comment on attachment 66940 [details]
Proposed Patch

>      char uuidStr[37] = {0};
> -    if (!fgets(uuidStr, sizeof(uuidStr) - 1, fptr))
> +    if (!fgets(uuidStr, sizeof(uuidStr), fptr))
>          return String();
>      fclose(fptr);

This code leaks a file descriptor if fgets fails. We still need to call fclose, even if fgets failed.

[Jian Li]

All fixed. Committed as http://trac.webkit.org/changeset/67017.

[WebKit Review Bot]

http://trac.webkit.org/changeset/67017 might have broken Leopard Intel Debug (Tests)