Title: [94870] branches/chromium/874/Source/WebCore/platform/KURLGoogle.cpp
- Revision
- 94870
- Author
- [email protected]
- Date
- 2011-09-09 11:37:24 -0700 (Fri, 09 Sep 2011)
Log Message
Merge 94821 - [chromium] KURL::copy doesn't produce something usable on another thread.
https://bugs.webkit.org/show_bug.cgi?id=67809
Reviewed by Adam Barth.
No new functionality exposed so no new test. This was caught by testing code: the thread
sanitizer run in Chromium (http://code.google.com/p/chromium/issues/detail?id=93708).
* platform/KURLGoogle.cpp:
(WebCore::KURLGooglePrivate::copyTo): Clear out the invalid String so that it will
not be used on another thread.
[email protected]
Review URL: http://codereview.chromium.org/7867002
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/platform/KURLGoogle.cpp (94869 => 94870)
--- branches/chromium/874/Source/WebCore/platform/KURLGoogle.cpp 2011-09-09 18:37:05 UTC (rev 94869)
+++ branches/chromium/874/Source/WebCore/platform/KURLGoogle.cpp 2011-09-09 18:37:24 UTC (rev 94870)
@@ -284,6 +284,7 @@
dest->m_utf8 = CString(m_utf8.data(), m_utf8.length());
dest->m_utf8IsASCII = m_utf8IsASCII;
dest->m_stringIsValid = false;
+ dest->m_string = String(); // Clear the invalid string to avoid cross thread ref counting.
}
String KURLGooglePrivate::componentString(const url_parse::Component& comp) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
