Title: [202643] trunk/Source/WebCore
Revision
202643
Author
jiewen_...@apple.com
Date
2016-06-29 12:54:23 -0700 (Wed, 29 Jun 2016)

Log Message

Unreviewed, third attempt to fix ASAN build for r202599

* platform/text/TextCodecReplacement.cpp:
(WebCore::TextCodecReplacement::decode):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (202642 => 202643)


--- trunk/Source/WebCore/ChangeLog	2016-06-29 19:29:07 UTC (rev 202642)
+++ trunk/Source/WebCore/ChangeLog	2016-06-29 19:54:23 UTC (rev 202643)
@@ -1,3 +1,10 @@
+2016-06-29  Jiewen Tan  <jiewen_...@apple.com>
+
+        Unreviewed, third attempt to fix ASAN build for r202599
+
+        * platform/text/TextCodecReplacement.cpp:
+        (WebCore::TextCodecReplacement::decode):
+
 2016-06-29  Jer Noble  <jer.no...@apple.com>
 
         Adopt MediaRemote.

Modified: trunk/Source/WebCore/platform/text/TextCodecReplacement.cpp (202642 => 202643)


--- trunk/Source/WebCore/platform/text/TextCodecReplacement.cpp	2016-06-29 19:29:07 UTC (rev 202642)
+++ trunk/Source/WebCore/platform/text/TextCodecReplacement.cpp	2016-06-29 19:54:23 UTC (rev 202643)
@@ -26,10 +26,10 @@
 #include "config.h"
 #include "TextCodecReplacement.h"
 
+#include <wtf/unicode/CharacterNames.h>
+
 namespace WebCore {
 
-static const UChar ReplacementCharacter[2] = { 0xFFFD, 0 };
-
 std::unique_ptr<TextCodec> TextCodecReplacement::create(const TextEncoding&, const void*)
 {
     return std::make_unique<TextCodecReplacement>();
@@ -65,7 +65,7 @@
         return emptyString();
 
     m_sentEOF = true;
-    return ReplacementCharacter;
+    return String(&replacementCharacter, 1);
 }
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to