Title: [184021] branches/safari-600.1.4.16-branch/Source/WebCore
- Revision
- 184021
- Author
- [email protected]
- Date
- 2015-05-08 15:59:18 -0700 (Fri, 08 May 2015)
Log Message
Merged r183649. rdar://problem/20840031
Modified Paths
Diff
Modified: branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog (184020 => 184021)
--- branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-05-08 22:56:33 UTC (rev 184020)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-05-08 22:59:18 UTC (rev 184021)
@@ -1,5 +1,18 @@
2015-05-08 Babak Shafiei <[email protected]>
+ Merge r183649.
+
+ 2015-04-30 Brady Eidson <[email protected]>
+
+ 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 <[email protected]>
+
Merge r183646.
2015-04-30 Brady Eidson <[email protected]>
Modified: branches/safari-600.1.4.16-branch/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (184020 => 184021)
--- branches/safari-600.1.4.16-branch/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-05-08 22:56:33 UTC (rev 184020)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-05-08 22:59:18 UTC (rev 184021)
@@ -99,8 +99,8 @@
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);
});
return qualifiedName;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
