Changeset 192583 in webkit

Timestamp:

Nov 18, 2015 11:47:08 AM (9 years ago)

Author:

dbates@webkit.org

Message:

[iOS] ASSERTION FAILED: temporaryFilePath.last() == '/' in WebCore::openTemporaryFile()
​https://bugs.webkit.org/show_bug.cgi?id=151392
<rdar://problem/23595341>

Reviewed by Alexey Proskuryakov.

Workaround <rdar://problem/23579077> where confstr(_CS_DARWIN_USER_TEMP_DIR, ..., ...) retrieves
the path to the user temporary directory without a trailing slash in the iOS simulator.

Source/WebCore:

• platform/mac/FileSystemMac.mm:

(WebCore::openTemporaryFile): Add a path separator (/) between the directory path and filename.

Source/WebKit2:

• Shared/mac/SandboxExtensionMac.mm:

(WebKit::SandboxExtension::createHandleForTemporaryFile): Add a path separator (/) between the directory path and filename.

Source/WTF:

• wtf/DataLog.cpp:

(WTF::initializeLogFileOnce):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/DataLog.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mac/FileSystemMac.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/mac/SandboxExtensionMac.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-11-18  Daniel Bates  <dabates@apple.com>
+
+        [iOS] ASSERTION FAILED: temporaryFilePath.last() == '/' in WebCore::openTemporaryFile()
+        https://bugs.webkit.org/show_bug.cgi?id=151392
+        <rdar://problem/23595341>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Workaround <rdar://problem/23579077> where confstr(_CS_DARWIN_USER_TEMP_DIR, ..., ...) retrieves
+        the path to the user temporary directory without a trailing slash in the iOS simulator.
+
+        * wtf/DataLog.cpp:
+        (WTF::initializeLogFileOnce):
+
 2015-11-17  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/DataLog.cpp

@@ -82 +82 @@
 #endif
 
-    const char* filename = 0;
+    const char* filename = nullptr;
 
-    size_t lastComponentLength = strlen(logBasename) + suffixLength;
-    size_t dirnameLength = confstr(_CS_DARWIN_USER_TEMP_DIR, filenameBuffer, 1024);
-    if ((dirnameLength + lastComponentLength + suffixLength) < maxPathLength) {
-        strncat(filenameBuffer, logBasename, maxPathLength - dirnameLength);
-        filename = filenameBuffer;
+    bool success = confstr(_CS_DARWIN_USER_TEMP_DIR, filenameBuffer, sizeof(filenameBuffer));
+    if (success) {
+        // FIXME: Assert that the path ends with a slash instead of adding a slash if it does not exist
+        // once <rdar://problem/23579077> is fixed in all iOS Simulator versions that we use.
+        size_t lastComponentLength = strlen(logBasename) + suffixLength;
+        size_t dirnameLength = strlen(filenameBuffer);
+        bool shouldAddPathSeparator = filenameBuffer[dirnameLength - 1] != '/' && logBasename[0] != '/';
+        if (lastComponentLength + shouldAddPathSeparator <= sizeof(filenameBuffer) - dirnameLength - 1) {
+            if (shouldAddPathSeparator)
+                strncat(filenameBuffer, "/", 1);
+            strncat(filenameBuffer, logBasename, sizeof(filenameBuffer) - strlen(filenameBuffer) - 1);
+            filename = filenameBuffer;
+        }
     }
 #elif defined(DATA_LOG_FILENAME)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-18  Daniel Bates  <dabates@apple.com>
+
+        [iOS] ASSERTION FAILED: temporaryFilePath.last() == '/' in WebCore::openTemporaryFile()
+        https://bugs.webkit.org/show_bug.cgi?id=151392
+        <rdar://problem/23595341>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Workaround <rdar://problem/23579077> where confstr(_CS_DARWIN_USER_TEMP_DIR, ..., ...) retrieves
+        the path to the user temporary directory without a trailing slash in the iOS simulator.
+
+        * platform/mac/FileSystemMac.mm:
+        (WebCore::openTemporaryFile): Add a path separator (/) between the directory path and filename.
+
 2015-11-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/mac/FileSystemMac.mm

@@ -70 +70 @@
     // Shrink the vector.   
     temporaryFilePath.shrink(strlen(temporaryFilePath.data()));
-    ASSERT(temporaryFilePath.last() == '/');
+
+    // FIXME: Change to a runtime assertion that the path ends with a slash once <rdar://problem/23579077> is
+    // fixed in all iOS Simulator versions that we use.
+    if (temporaryFilePath.last() != '/')
+        temporaryFilePath.append('/');
 
     // Append the file name.

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-11-18  Daniel Bates  <dabates@apple.com>
+
+        [iOS] ASSERTION FAILED: temporaryFilePath.last() == '/' in WebCore::openTemporaryFile()
+        https://bugs.webkit.org/show_bug.cgi?id=151392
+        <rdar://problem/23595341>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Workaround <rdar://problem/23579077> where confstr(_CS_DARWIN_USER_TEMP_DIR, ..., ...) retrieves
+        the path to the user temporary directory without a trailing slash in the iOS simulator.
+
+        * Shared/mac/SandboxExtensionMac.mm:
+        (WebKit::SandboxExtension::createHandleForTemporaryFile): Add a path separator (/) between the directory path and filename.
+
 2015-11-17  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm

@@ -250 +250 @@
     // Shrink the vector.   
     path.shrink(strlen(path.data()));
-    ASSERT(path.last() == '/');
+
+    // FIXME: Change to a runtime assertion that the path ends with a slash once <rdar://problem/23579077> is
+    // fixed in all iOS Simulator versions that we use.
+    if (path.last() != '/')
+        path.append('/');
     
     // Append the file name.