Title: [104984] branches/safari-534.54-branch/Source/WebCore
- Revision
- 104984
- Author
- lforsch...@apple.com
- Date
- 2012-01-13 13:39:21 -0800 (Fri, 13 Jan 2012)
Log Message
Rollout 99999 (104249).
Modified Paths
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104983 => 104984)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-13 21:38:32 UTC (rev 104983)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-13 21:39:21 UTC (rev 104984)
@@ -1,3 +1,10 @@
+2012-01-13 Lucas Forschler <lforsch...@apple.com>
+
+ Roll-out r99999 (which is 104249 on branch)
+
+ * platform/KURL.cpp:
+ (WebCore::KURL::init):
+
2011-1-12 Lucas Forschler <lforsch...@apple.com>
Merge 103082
Modified: branches/safari-534.54-branch/Source/WebCore/platform/KURL.cpp (104983 => 104984)
--- branches/safari-534.54-branch/Source/WebCore/platform/KURL.cpp 2012-01-13 21:38:32 UTC (rev 104983)
+++ branches/safari-534.54-branch/Source/WebCore/platform/KURL.cpp 2012-01-13 21:39:21 UTC (rev 104984)
@@ -473,11 +473,9 @@
// must be relative-path reference
// Base part plus relative part plus one possible slash added in between plus terminating \0 byte.
- const size_t bufferSize = base.m_pathEnd + 1 + len + 1;
- parseBuffer.resize(bufferSize);
+ parseBuffer.resize(base.m_pathEnd + 1 + len + 1);
char* bufferPos = parseBuffer.data();
- const char* bufferStart = bufferPos;
// first copy everything before the path from the base
unsigned baseLength = base.m_string.length();
@@ -540,7 +538,7 @@
// all done with the path work, now copy any remainder
// of the relative reference; this will also add a null terminator
- strncpy(bufferPos, relStringPos, bufferSize - (bufferPos - bufferStart));
+ strcpy(bufferPos, relStringPos);
parse(parseBuffer.data(), relative);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
