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.

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

Properly check storage size against QUOTA_SIZE_LIMIT (fixes #12247) #12289

Merged
merged 1 commit into from Jul 7, 2016

Conversation

@nox
Copy link
Member

nox commented Jul 6, 2016

This change is Reviewable

@highfive
Copy link

highfive commented Jul 6, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/net/storage_thread.rs, components/net_traits/storage_thread.rs, components/net_traits/storage_thread.rs
@highfive
Copy link

highfive commented Jul 6, 2016

warning Warning warning

  • These commits modify net code, but no tests are modified. Please consider adding a test!
let local_data = self.select_data(StorageType::Local);
let session_data = self.select_data(StorageType::Session);
let local_data_size = local_data.get(&origin).map_or(0, |&(total, _)| total);
let session_data_size = session_data.get(&origin).map_or(0, |&(total, _)| total);
local_data_size + session_data_size
if storage_type == StorageType::Local {

This comment has been minimized.

@Ms2ger

Ms2ger Jul 6, 2016

Contributor

Make this a match instead

@nox nox force-pushed the nox:slate branch from 6638032 to e252793 Jul 6, 2016
@nox
Copy link
Member Author

nox commented Jul 6, 2016

@bors-servo r=Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2016

📌 Commit e252793 has been approved by Ms2ger

@highfive highfive assigned Ms2ger and unassigned pcwalton Jul 6, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

Testing commit e252793 with merge 32fa565...

bors-servo added a commit that referenced this pull request Jul 7, 2016
Properly check storage size against QUOTA_SIZE_LIMIT (fixes #12247)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12289)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

@bors-servo bors-servo merged commit e252793 into servo:master Jul 7, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.