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

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

Issue 19623002: Make atob() throw an InvalidCharacterError on excess padding characters (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
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 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 { 960 {
961 if (encodedString.isNull()) 961 if (encodedString.isNull())
962 return String(); 962 return String();
963 963
964 if (!encodedString.containsOnlyLatin1()) { 964 if (!encodedString.containsOnlyLatin1()) {
965 ec = InvalidCharacterError; 965 ec = InvalidCharacterError;
966 return String(); 966 return String();
967 } 967 }
968 968
969 Vector<char> out; 969 Vector<char> out;
970 if (!base64Decode(encodedString, out, Base64FailOnInvalidCharacter)) { 970 if (!base64Decode(encodedString, out, Base64FailOnInvalidCharacter, Base64St rictPaddingValidation)) {
971 ec = InvalidCharacterError; 971 ec = InvalidCharacterError;
972 return String(); 972 return String();
973 } 973 }
974 974
975 return String(out.data(), out.size()); 975 return String(out.data(), out.size());
976 } 976 }
977 977
978 bool DOMWindow::find(const String& string, bool caseSensitive, bool backwards, b ool wrap, bool /*wholeWord*/, bool /*searchInFrames*/, bool /*showDialog*/) cons t 978 bool DOMWindow::find(const String& string, bool caseSensitive, bool backwards, b ool wrap, bool /*wholeWord*/, bool /*searchInFrames*/, bool /*showDialog*/) cons t
979 { 979 {
980 if (!isCurrentlyDisplayedInFrame()) 980 if (!isCurrentlyDisplayedInFrame())
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 1955
1956 Frame* child = frame->tree()->scopedChild(index); 1956 Frame* child = frame->tree()->scopedChild(index);
1957 if (child) 1957 if (child)
1958 return child->document()->domWindow(); 1958 return child->document()->domWindow();
1959 1959
1960 return 0; 1960 return 0;
1961 } 1961 }
1962 1962
1963 1963
1964 } // namespace WebCore 1964 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698