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

Side by Side Diff: Source/core/page/DOMWindowBase64.cpp

Issue 19623002: Make atob() throw an InvalidCharacterError on excess padding characters (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 5 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 | « LayoutTests/fast/dom/Window/atob-btoa-expected.txt ('k') | Source/wtf/text/Base64.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2013 Samsung Electronics. All rights reserved. 4 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 { 56 {
57 if (encodedString.isNull()) 57 if (encodedString.isNull())
58 return String(); 58 return String();
59 59
60 if (!encodedString.containsOnlyLatin1()) { 60 if (!encodedString.containsOnlyLatin1()) {
61 ec = InvalidCharacterError; 61 ec = InvalidCharacterError;
62 return String(); 62 return String();
63 } 63 }
64 64
65 Vector<char> out; 65 Vector<char> out;
66 if (!base64Decode(encodedString, out, Base64FailOnInvalidCharacter)) { 66 if (!base64Decode(encodedString, out, Base64FailOnInvalidCharacter, Base64St rictPaddingValidation)) {
67 ec = InvalidCharacterError; 67 ec = InvalidCharacterError;
68 return String(); 68 return String();
69 } 69 }
70 70
71 return String(out.data(), out.size()); 71 return String(out.data(), out.size());
72 } 72 }
73 73
74 } // namespace DOMWindowBase64 74 } // namespace DOMWindowBase64
75 75
76 } // namespace WebCore 76 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/Window/atob-btoa-expected.txt ('k') | Source/wtf/text/Base64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698