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

Side by Side Diff: chrome/browser/extensions/convert_user_script.cc

Issue 362343006: Fix dangerous pointer use in UserScriptMaster (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/convert_user_script.h" 5 #include "chrome/browser/extensions/convert_user_script.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 27 matching lines...) Expand all
38 *error = base::ASCIIToUTF16("Could not read source file."); 38 *error = base::ASCIIToUTF16("Could not read source file.");
39 return NULL; 39 return NULL;
40 } 40 }
41 41
42 if (!base::IsStringUTF8(content)) { 42 if (!base::IsStringUTF8(content)) {
43 *error = base::ASCIIToUTF16("User script must be UTF8 encoded."); 43 *error = base::ASCIIToUTF16("User script must be UTF8 encoded.");
44 return NULL; 44 return NULL;
45 } 45 }
46 46
47 UserScript script; 47 UserScript script;
48 if (!UserScriptMaster::ScriptReloader::ParseMetadataHeader(content, 48 if (!UserScriptMaster::ParseMetadataHeader(content, &script)) {
49 &script)) {
50 *error = base::ASCIIToUTF16("Invalid script header."); 49 *error = base::ASCIIToUTF16("Invalid script header.");
51 return NULL; 50 return NULL;
52 } 51 }
53 52
54 base::FilePath install_temp_dir = 53 base::FilePath install_temp_dir =
55 file_util::GetInstallTempDir(extensions_dir); 54 file_util::GetInstallTempDir(extensions_dir);
56 if (install_temp_dir.empty()) { 55 if (install_temp_dir.empty()) {
57 *error = base::ASCIIToUTF16( 56 *error = base::ASCIIToUTF16(
58 "Could not get path to profile temporary directory."); 57 "Could not get path to profile temporary directory.");
59 return NULL; 58 return NULL;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 if (!extension.get()) { 183 if (!extension.get()) {
185 NOTREACHED() << "Could not init extension " << *error; 184 NOTREACHED() << "Could not init extension " << *error;
186 return NULL; 185 return NULL;
187 } 186 }
188 187
189 temp_dir.Take(); // The caller takes ownership of the directory. 188 temp_dir.Take(); // The caller takes ownership of the directory.
190 return extension; 189 return extension;
191 } 190 }
192 191
193 } // namespace extensions 192 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_system_impl.h » ('j') | chrome/browser/extensions/user_script_master.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698