diff options
Diffstat (limited to 'www-client/chromium/files/chromium-bug471198.patch')
-rw-r--r-- | www-client/chromium/files/chromium-bug471198.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/www-client/chromium/files/chromium-bug471198.patch b/www-client/chromium/files/chromium-bug471198.patch deleted file mode 100644 index e55f55e663e2..000000000000 --- a/www-client/chromium/files/chromium-bug471198.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- trunk/src/sandbox/linux/services/broker_process.cc 2013/07/09 21:47:01 210650 -+++ trunk/src/sandbox/linux/services/broker_process.cc 2013/07/09 21:47:27 210651 -@@ -53,7 +53,7 @@ - // async signal safe if |file_to_open| is NULL. - // TODO(jln): assert signal safety. - bool GetFileNameInWhitelist(const std::vector<std::string>& allowed_file_names, -- const std::string& requested_filename, -+ const char* requested_filename, - const char** file_to_open) { - if (file_to_open && *file_to_open) { - // Make sure that callers never pass a non-empty string. In case callers -@@ -62,13 +62,17 @@ - RAW_LOG(FATAL, "*file_to_open should be NULL"); - return false; - } -+ -+ // Look for |requested_filename| in |allowed_file_names|. -+ // We don't use ::find() because it takes a std::string and -+ // the conversion allocates memory. - std::vector<std::string>::const_iterator it; -- it = std::find(allowed_file_names.begin(), allowed_file_names.end(), -- requested_filename); -- if (it < allowed_file_names.end()) { // requested_filename was found? -- if (file_to_open) -- *file_to_open = it->c_str(); -- return true; -+ for (it = allowed_file_names.begin(); it != allowed_file_names.end(); it++) { -+ if (strcmp(requested_filename, it->c_str()) == 0) { -+ if (file_to_open) -+ *file_to_open = it->c_str(); -+ return true; -+ } - } - return false; - } -@@ -393,6 +397,7 @@ - const char* file_to_access = NULL; - const bool safe_to_access_file = GetFileNameIfAllowedToAccess( - requested_filename.c_str(), mode, &file_to_access); -+ - if (safe_to_access_file) { - CHECK(file_to_access); - int access_ret = access(file_to_access, mode); |