Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

11895: Fix buffer overrun in GetCryptoRandomString(). #7262

Merged
merged 2 commits into from
Dec 1, 2020
Merged

11895: Fix buffer overrun in GetCryptoRandomString(). #7262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02e2235
11895: Fix buffer overrun in GetCryptoRandomString().
iefremov Nov 26, 2020
26f349b
11895: Fix another memory bug and enable asan for problematic tests.
iefremov Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions components/ntp_widget_utils/browser/ntp_widget_utils_oauth.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,15 @@
namespace ntp_widget_utils {

std::string GetCryptoRandomString(bool hex_encode) {
const size_t kSeedByteLength = 32;
constexpr size_t kSeedByteLength = 32;
uint8_t random_seed_bytes[kSeedByteLength];
crypto::RandBytes(random_seed_bytes, kSeedByteLength);

if (!hex_encode) {
std::string encoded_string;
base::Base64Encode(
reinterpret_cast<char*>(random_seed_bytes), &encoded_string);
return encoded_string;
return base::Base64Encode(random_seed_bytes);
}

return base::HexEncode(
reinterpret_cast<char*>(random_seed_bytes), kSeedByteLength);
return base::HexEncode(random_seed_bytes, kSeedByteLength);
}

std::string GetCodeChallenge(
Expand Down
3 changes: 3 additions & 0 deletions components/weekly_storage/weekly_storage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ uint64_t WeeklyStorage::GetHighestValueInWeek() const {
[](const auto& left, const auto& right) {
return left.value < right.value;
});
if (highest_it == last_weeks_daily_values.end()) {
return 0;
}
return highest_it->value;
}

Expand Down
26 changes: 6 additions & 20 deletions test/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ if (!is_android) {
"//brave/browser/brave_content_browser_client_browsertest.cc",
"//brave/browser/brave_profile_prefs_browsertest.cc",
"//brave/browser/brave_resources_browsertest.cc",
"//brave/browser/brave_scheme_load_browsertest.cc",
"//brave/browser/brave_shields/ad_block_service_browsertest.cc",
"//brave/browser/brave_shields/cookie_pref_service_browsertest.cc",
"//brave/browser/brave_stats/brave_stats_updater_browsertest.cc",
Expand Down Expand Up @@ -599,6 +600,7 @@ if (!is_android) {
"//brave/browser/ui/views/tabs/brave_tab_context_menu_contents_browsertest.cc",
"//brave/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc",
"//brave/browser/ui/webui/brave_welcome_ui_browsertest.cc",
"//brave/browser/ui/webui/new_tab_page/brave_new_tab_ui_browsertest.cc",
"//brave/chromium_src/chrome/browser/media/router/media_router_feature_browsertest.cc",
"//brave/chromium_src/chrome/browser/profiles/profile_window_browsertest.cc",
"//brave/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc",
Expand Down Expand Up @@ -631,15 +633,6 @@ if (!is_android) {
"//chrome/browser/ui/test/test_browser_ui.h",
]

if (!is_asan) {
# Move outside the !is_asan block once
# https://github.com/brave/brave-browser/issues/11897
# https://github.com/brave/brave-browser/issues/11906 is fixed
sources += [
"//brave/browser/brave_scheme_load_browsertest.cc",
"//brave/browser/ui/webui/new_tab_page/brave_new_tab_ui_browsertest.cc",
]
}
if (is_mac) {
sources += [
"//chrome/browser/ui/test/test_browser_dialog_mac.h",
Expand All @@ -656,9 +649,7 @@ if (!is_android) {
"//media:test_support",
]

if (enable_widevine && !is_asan) {
# Remove the !is_asan check once
# https://github.com/brave/brave-browser/issues/11901 is fixed
if (enable_widevine) {
sources += [
"//brave/browser/widevine/widevine_permission_request_browsertest.cc",
"//brave/browser/widevine/widevine_prefs_migration_browsertest.cc",
Expand Down Expand Up @@ -697,7 +688,7 @@ if (!is_android) {
]
}

if (binance_enabled && !is_asan) {
if (binance_enabled) {
sources += [
"//brave/components/binance/browser/binance_service_browsertest.cc",
]
Expand All @@ -708,7 +699,7 @@ if (!is_android) {
]
}

if (gemini_enabled && !is_asan) {
if (gemini_enabled) {
sources +=
[ "//brave/components/gemini/browser/gemini_service_browsertest.cc" ]
deps += [
Expand Down Expand Up @@ -744,6 +735,7 @@ if (!is_android) {
"//brave/components/brave_rewards/browser/test/common/rewards_browsertest_response.h",
"//brave/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc",
"//brave/components/brave_rewards/browser/test/common/rewards_browsertest_util.h",
"//brave/components/brave_rewards/browser/test/rewards_browsertest.cc",
"//brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc",
"//brave/components/brave_rewards/browser/test/rewards_database_browsertest.cc",
"//brave/components/brave_rewards/browser/test/rewards_flag_browsertest.cc",
Expand All @@ -753,12 +745,6 @@ if (!is_android) {
"//brave/components/brave_rewards/browser/test/rewards_state_browsertest.cc",
]

if (!is_asan) {
# Move this out of the !is_asan block once
# https://github.com/brave/brave-browser/issues/11900 is fixed
sources += [ "//brave/components/brave_rewards/browser/test/rewards_browsertest.cc" ]
}

deps += [
"//brave/components/brave_ads/browser",
"//brave/components/brave_ads/common",
Expand Down