Merge 67017 - Fix a problem in createCanonicalUUIDString that causes the last...

WebCore/platform/UUID.cpp

 /*
 * Copyright (C) 2010 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 66 matching lines @@
     String uuidStr(uuidStrRef);
     CFRelease(uuidStrRef);
     CFRelease(uuid);
     String canonicalUuidStr = uuidStr.lower(); // make it lower.
     ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
     return canonicalUuidStr;
 #elif OS(LINUX)
     FILE* fptr = fopen("/proc/sys/kernel/random/uuid", "r");
     if (!fptr)
         return String();
-    char uuidStr[37] = {0};
-    if (!fgets(uuidStr, sizeof(uuidStr) - 1, fptr))
+    char uuidStr[37];
+    char* result = fgets(uuidStr, sizeof(uuidStr), fptr);
+    fclose(fptr);
+    if (!result)
         return String();
-    fclose(fptr);
     String canonicalUuidStr = String(uuidStr).lower(); // make it lower.
     ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
     return canonicalUuidStr;
 #else
     notImplemented();
     return String();
 #endif    
 }
 
 }