Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: Source/wtf/text/TextCodecReplacement.cpp

Issue 261013007: Prevent direct use of "replacement" text encoding. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: MSVC fix Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/encoding/TextDecoder.cpp ('k') | Source/wtf/text/TextCodecReplacementTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "wtf/text/TextCodecReplacement.h" 6 #include "wtf/text/TextCodecReplacement.h"
7 7
8 #include "wtf/PassOwnPtr.h" 8 #include "wtf/PassOwnPtr.h"
9 #include "wtf/text/WTFString.h" 9 #include "wtf/text/WTFString.h"
10 #include "wtf/unicode/CharacterNames.h" 10 #include "wtf/unicode/CharacterNames.h"
11 11
12 namespace WTF { 12 namespace WTF {
13 13
14 TextCodecReplacement::TextCodecReplacement() 14 TextCodecReplacement::TextCodecReplacement()
15 : m_sentEOF(false) 15 : m_sentEOF(false)
16 { 16 {
17 } 17 }
18 18
19 void TextCodecReplacement::registerEncodingNames(EncodingNameRegistrar registrar ) 19 void TextCodecReplacement::registerEncodingNames(EncodingNameRegistrar registrar )
20 { 20 {
21 // FIXME: The 'replacement' label itself should not be referenceable by 21 // The 'replacement' label itself should not be referenceable by
22 // resources or script - it's a specification convenience - but much of 22 // resources or script - it's a specification convenience - but much of
23 // the wtf/text API asserts that an encoding name is a label for itself. 23 // the wtf/text API asserts that an encoding name is a label for itself.
24 // crbug.com/277037 24 // This is handled in TextEncoding by marking it as not valid.
25 registrar("replacement", "replacement"); 25 registrar("replacement", "replacement");
26 26
27 registrar("csiso2022kr", "replacement"); 27 registrar("csiso2022kr", "replacement");
28 registrar("hz-gb-2312", "replacement"); 28 registrar("hz-gb-2312", "replacement");
29 registrar("iso-2022-cn", "replacement"); 29 registrar("iso-2022-cn", "replacement");
30 registrar("iso-2022-cn-ext", "replacement"); 30 registrar("iso-2022-cn-ext", "replacement");
31 registrar("iso-2022-kr", "replacement"); 31 registrar("iso-2022-kr", "replacement");
32 } 32 }
33 33
34 static PassOwnPtr<TextCodec> newStreamingTextDecoderReplacement(const TextEncodi ng&, const void*) 34 static PassOwnPtr<TextCodec> newStreamingTextDecoderReplacement(const TextEncodi ng&, const void*)
(...skipping 10 matching lines...) Expand all
45 { 45 {
46 sawError = true; 46 sawError = true;
47 if (m_sentEOF) 47 if (m_sentEOF)
48 return String(); 48 return String();
49 49
50 m_sentEOF = true; 50 m_sentEOF = true;
51 return String(&Unicode::replacementCharacter, 1); 51 return String(&Unicode::replacementCharacter, 1);
52 } 52 }
53 53
54 } // namespace WTF 54 } // namespace WTF
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextDecoder.cpp ('k') | Source/wtf/text/TextCodecReplacementTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698