third_party/WebKit/Source/wtf/text/TextCodecICU.cpp - Issue 2478653002: Don't initialize ICU replacement character for UTF-32 encodings

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/wtf/text/TextCodecICU.cpp

Issue 2478653002: Don't initialize ICU replacement character for UTF-32 encodings (Closed)

Patch Set: Don't use zero-length array initializer, to keep MSVC happy Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/wtf/text/TextCodecICU.cpp

diff --git a/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp b/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp

index 196c1beba038697be35cf38cb38a3b80d71d9125..fba4b79a40a00bd06158a7739ef7e51d9cfec266 100644

--- a/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp

+++ b/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp

@@ -608,7 +608,11 @@ CString TextCodecICU::encodeInternal(const TextCodecInput& input,

switch (handling) {

case QuestionMarksForUnencodables:

- ucnv_setSubstChars(m_converterICU, "?", 1, &err);

+ // Non-byte-based encodings (i.e. UTF-16/32) don't need substitutions

+ // since they can encode any code point, and ucnv_setSubstChars would

+ // require a multi-byte substitution anyway.

+ if (!m_encoding.isNonByteBasedEncoding())

+ ucnv_setSubstChars(m_converterICU, "?", 1, &err);

#if !defined(USING_SYSTEM_ICU)

ucnv_setFromUCallBack(m_converterICU, UCNV_FROM_U_CALLBACK_SUBSTITUTE, 0,

0, 0, &err);