[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jianli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 5f8c6bdba5f7f91b0a9482eecc8459f5789eb42a
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 21:40:37 2010 +0000

    Fix a problem in createCanonicalUUIDString that causes the last digit
    missing on Linux.
    https://bugs.webkit.org/show_bug.cgi?id=45412
    
    Reviewed by Darin Adler.
    
    WebCore:
    
    This is caused by not including the final null character into the count
    that is provided to fgets.
    
    This is covered by the existing test: send-form-data-with-sliced-file.html.
    
    * platform/UUID.cpp:
    (WebCore::createCanonicalUUIDString):
    
    LayoutTests:
    
    Remove the test that is now passing on Linux for chromium.
    
    * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 654bc42..c0db305 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-08  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix a problem in createCanonicalUUIDString that causes the last digit
+        missing on Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=45412
+
+        Remove the test that is now passing on Linux for chromium.
+
+        * platform/chromium/test_expectations.txt:
+
 2010-09-08  Peter Kasting  <pkasting at google.com>
 
         Not reviewed, skip failing layout tests.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index f90ad20..80b3ebc 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2553,9 +2553,6 @@ BUG41206 : fast/history/multiple-classes-visited.html = TEXT TIMEOUT
 BUG41292 : fast/url/ipv4.html = TEXT TIMEOUT
 BUG41292 : fast/url/anchor.html = TEXT TIMEOUT
 
-// Caused by r57695. Will investigate.
-BUG_JIANLI LINUX : http/tests/local/formdata/send-form-data-with-sliced-file.html = TEXT
-
 BUG33812 SKIP : fast/dom/icon-url-property.html = FAIL
 
 // Failing with webkit roll 57659 -> 57677.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9966076..bd3c157 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-08  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix a problem in createCanonicalUUIDString that causes the last digit
+        missing on Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=45412
+
+        This is caused by not including the final null character into the count
+        that is provided to fgets.
+
+        This is covered by the existing test: send-form-data-with-sliced-file.html.
+
+        * platform/UUID.cpp:
+        (WebCore::createCanonicalUUIDString):
+
 2010-09-08  Nico Weber  <thakis at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/UUID.cpp b/WebCore/platform/UUID.cpp
index 852e3ae..fdbf601 100644
--- a/WebCore/platform/UUID.cpp
+++ b/WebCore/platform/UUID.cpp
@@ -84,10 +84,11 @@ String createCanonicalUUIDString()
     FILE* fptr = fopen("/proc/sys/kernel/random/uuid", "r");
     if (!fptr)
         return String();
-    char uuidStr[37] = {0};
-    if (!fgets(uuidStr, sizeof(uuidStr) - 1, fptr))
-        return String();
+    char uuidStr[37];
+    char* result = fgets(uuidStr, sizeof(uuidStr), fptr);
     fclose(fptr);
+    if (!result)
+        return String();
     String canonicalUuidStr = String(uuidStr).lower(); // make it lower.
     ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
     return canonicalUuidStr;

-- 
WebKit Debian packaging