Skip to content
Permalink
Browse files
Unreviewed, third attempt to fix ASAN build for r202599
* platform/text/TextCodecReplacement.cpp:
(WebCore::TextCodecReplacement::decode):

Canonical link: https://commits.webkit.org/177387@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202643 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Jiewen Tan committed Jun 29, 2016
1 parent 489b347 commit 5b101179eb991e555c6b8ec28a140ce59fef4ee2
Showing 2 changed files with 10 additions and 3 deletions.
@@ -1,3 +1,10 @@
2016-06-29 Jiewen Tan <jiewen_tan@apple.com>

Unreviewed, third attempt to fix ASAN build for r202599

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

2016-06-29 Jer Noble <jer.noble@apple.com>

Adopt MediaRemote.
@@ -26,9 +26,9 @@
#include "config.h"
#include "TextCodecReplacement.h"

namespace WebCore {
#include <wtf/unicode/CharacterNames.h>

static const UChar ReplacementCharacter[2] = { 0xFFFD, 0 };
namespace WebCore {

std::unique_ptr<TextCodec> TextCodecReplacement::create(const TextEncoding&, const void*)
{
@@ -65,7 +65,7 @@ String TextCodecReplacement::decode(const char*, size_t, bool, bool, bool& sawEr
return emptyString();

m_sentEOF = true;
return ReplacementCharacter;
return String(&replacementCharacter, 1);
}

} // namespace WebCore

0 comments on commit 5b10117

Please sign in to comment.