Hang underneath ApplicationCacheStorage::writeDataToUniqueFileInDirectory when loading

Jessie Berlin · Jessie Berlin · commit 1ff5216d1e6d · 2011-04-15T23:51:03.000Z
http://www.webkit.org/demos/calendar. https://bugs.webkit.org/show_bug.cgi?id=58698 Reviewed by Brian Weinstein. * platform/win/FileSystemWin.cpp: (WebCore::openFile): Add breaks to the case statement. (WebCore::directoryName): Remove any trailing slash in directoryName. After closer inspection of all callers, it appears the that callers do not need the trailing slash, and those that use the length do so only to change the direction of the slashes throughout the length of the path. Canonical link: https://commits.webkit.org/73792@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84051 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-04-15  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Brian Weinstein.
+
+        Hang underneath ApplicationCacheStorage::writeDataToUniqueFileInDirectory when loading
+        http://www.webkit.org/demos/calendar.
+        https://bugs.webkit.org/show_bug.cgi?id=58698
+
+        * platform/win/FileSystemWin.cpp:
+        (WebCore::openFile):
+        Add breaks to the case statement.
+        (WebCore::directoryName):
+        Remove any trailing slash in directoryName. After closer inspection of all callers, it
+        appears the that callers do not need the trailing slash, and those that use the length do
+        so only to change the direction of the slashes throughout the length of the path.
+
 2011-04-15  Roland Steiner  <rolandsteiner@chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/Source/WebCore/platform/win/FileSystemWin.cpp b/Source/WebCore/platform/win/FileSystemWin.cpp
@@ -136,7 +136,12 @@ String pathGetFileName(const String& path)
 
 String directoryName(const String& path)
 {
-    return path.left(path.length() - pathGetFileName(path).length());
+    String name = path.left(path.length() - pathGetFileName(path).length());
+    if (name.characterStartingAt(name.length() - 1) == '\\') {
+        // Remove any trailing "\".
+        name.truncate(name.length() - 1);
+    }
+    return name;
 }
 
 static String bundleName()
@@ -241,9 +246,11 @@ PlatformFileHandle openFile(const String& path, FileOpenMode mode)
     case OpenForRead:
         desiredAccess = GENERIC_READ;
         creationDisposition = OPEN_EXISTING;
+        break;
     case OpenForWrite:
         desiredAccess = GENERIC_WRITE;
         creationDisposition = CREATE_ALWAYS;
+        break;
     default:
         ASSERT_NOT_REACHED();
     }
