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

Side by Side Diff: Source/modules/encoding/TextDecoder.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 32
33 #include "modules/encoding/TextDecoder.h" 33 #include "modules/encoding/TextDecoder.h"
34 34
35 #include "bindings/v8/ExceptionState.h" 35 #include "bindings/v8/ExceptionState.h"
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "wtf/StringExtras.h"
37 #include "wtf/text/TextEncodingRegistry.h" 38 #include "wtf/text/TextEncodingRegistry.h"
38 39
39 namespace WebCore { 40 namespace WebCore {
40 41
41 TextDecoder* TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState) 42 TextDecoder* TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState)
42 { 43 {
43 const String& encodingLabel = label.isNull() ? String("utf-8") : label; 44 const String& encodingLabel = label.isNull() ? String("utf-8") : label;
44 45
45 WTF::TextEncoding encoding(encodingLabel); 46 WTF::TextEncoding encoding(encodingLabel);
46 if (!encoding.isValid()) { 47 // The replacement encoding is not valid, but the Encoding API also
48 // rejects aliases of the replacement encoding.
49 if (!encoding.isValid() || !strcasecmp(encoding.name(), "replacement")) {
47 exceptionState.throwTypeError("The encoding label provided ('" + encodin gLabel + "') is invalid."); 50 exceptionState.throwTypeError("The encoding label provided ('" + encodin gLabel + "') is invalid.");
48 return 0; 51 return 0;
49 } 52 }
50 53
51 bool fatal = false; 54 bool fatal = false;
52 options.get("fatal", fatal); 55 options.get("fatal", fatal);
53 56
54 return new TextDecoder(encoding, fatal); 57 return new TextDecoder(encoding, fatal);
55 } 58 }
56 59
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 s.remove(0); 105 s.remove(0);
103 } 106 }
104 107
105 if (flush) 108 if (flush)
106 m_bomSeen = false; 109 m_bomSeen = false;
107 110
108 return s; 111 return s;
109 } 112 }
110 113
111 } // namespace WebCore 114 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/platform/win/fast/encoding/charset-replacement-expected.png ('k') | Source/wtf/text/TextCodecReplacement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698