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

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/DatabaseAuthorizer.cpp

Issue 2152173002: Fix static race in DatabaseAuthorizer's whitelistedFunctions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | 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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
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 12 matching lines...) Expand all
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "modules/webdatabase/DatabaseAuthorizer.h" 29 #include "modules/webdatabase/DatabaseAuthorizer.h"
30 30
31 #include "wtf/HashSet.h" 31 #include "wtf/HashSet.h"
32 #include "wtf/StdLibExtras.h" 32 #include "wtf/StdLibExtras.h"
33 #include "wtf/Threading.h"
33 #include "wtf/text/StringHash.h" 34 #include "wtf/text/StringHash.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 DatabaseAuthorizer* DatabaseAuthorizer::create(const String& databaseInfoTableNa me) 38 DatabaseAuthorizer* DatabaseAuthorizer::create(const String& databaseInfoTableNa me)
38 { 39 {
39 return new DatabaseAuthorizer(databaseInfoTableName); 40 return new DatabaseAuthorizer(databaseInfoTableName);
40 } 41 }
41 42
42 DatabaseAuthorizer::DatabaseAuthorizer(const String& databaseInfoTableName) 43 DatabaseAuthorizer::DatabaseAuthorizer(const String& databaseInfoTableName)
(...skipping 15 matching lines...) Expand all
58 void DatabaseAuthorizer::resetDeletes() 59 void DatabaseAuthorizer::resetDeletes()
59 { 60 {
60 m_hadDeletes = false; 61 m_hadDeletes = false;
61 } 62 }
62 63
63 namespace { 64 namespace {
64 using FunctionNameList = HashSet<String, CaseFoldingHash>; 65 using FunctionNameList = HashSet<String, CaseFoldingHash>;
65 66
66 const FunctionNameList& whitelistedFunctions() 67 const FunctionNameList& whitelistedFunctions()
67 { 68 {
68 DEFINE_STATIC_LOCAL(FunctionNameList, list, ({ 69 DEFINE_THREAD_SAFE_STATIC_LOCAL(FunctionNameList, list, new FunctionNameList ({
69 // SQLite functions used to help implement some operations 70 // SQLite functions used to help implement some operations
70 // ALTER TABLE helpers 71 // ALTER TABLE helpers
71 "sqlite_rename_table", 72 "sqlite_rename_table",
72 "sqlite_rename_trigger", 73 "sqlite_rename_trigger",
73 // GLOB helpers 74 // GLOB helpers
74 "glob", 75 "glob",
75 // SQLite core functions 76 // SQLite core functions
76 "abs", 77 "abs",
77 "changes", 78 "changes",
78 "coalesce", 79 "coalesce",
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 424
424 int DatabaseAuthorizer::updateDeletesBasedOnTableName(const String& tableName) 425 int DatabaseAuthorizer::updateDeletesBasedOnTableName(const String& tableName)
425 { 426 {
426 int allow = denyBasedOnTableName(tableName); 427 int allow = denyBasedOnTableName(tableName);
427 if (allow) 428 if (allow)
428 m_hadDeletes = true; 429 m_hadDeletes = true;
429 return allow; 430 return allow;
430 } 431 }
431 432
432 } // namespace blink 433 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698