Changeset 184027 in webkit

Timestamp:

May 8, 2015, 4:15:09 PM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r183649. rdar://problem/20840113

Location:

branches/safari-600.7-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webdatabase/DatabaseBackendBase.cpp (modified) (1 diff)

branches/safari-600.7-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-08  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r183649.
+
+    2015-04-30  Brady Eidson  <beidson@apple.com>
+
+            Build fix after r183646 for less enlightened platforms.
+
+            Unreviewed.
+
+            * Modules/webdatabase/DatabaseBackendBase.cpp:
+            (WebCore::fullyQualifiedInfoTableName): Windows doesn’t have stpcpy :(
+
 2015-05-08  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-600.7-branch/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp

@@ -100 +100 @@
     static std::once_flag onceFlag;
     std::call_once(onceFlag, []{
-        char* newDestination = stpcpy(qualifiedName, qualifier);
-        strcpy(newDestination, unqualifiedInfoTableName);
+        strcpy(qualifiedName, qualifier);
+        strcpy(qualifiedName + strlen(qualifier), unqualifiedInfoTableName);
     });