Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-17 04:13:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12289 - nox:slate, r=Ms2ger

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-07-06 18:52:05 -07:00 • committed by GitHub
commit 32fa565baf
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/net/storage_thread.rs
View file

@ -144,12 +144,15 @@ impl StorageManager {
value: String) { value: String) {
let origin = self.origin_as_string(url); let origin = self.origin_as_string(url);
let current_total_size = { let (this_storage_size, other_storage_size) = {
let local_data = self.select_data(StorageType::Local); let local_data = self.select_data(StorageType::Local);
let session_data = self.select_data(StorageType::Session); let session_data = self.select_data(StorageType::Session);
let local_data_size = local_data.get(&origin).map_or(0, |&(total, _)| total); 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); let session_data_size = session_data.get(&origin).map_or(0, |&(total, _)| total);
local_data_size + session_data_size match storage_type {
StorageType::Local => (local_data_size, session_data_size),
StorageType::Session => (session_data_size, local_data_size),
}
}; };
let data = self.select_data_mut(storage_type); let data = self.select_data_mut(storage_type);
@ -158,14 +161,14 @@ impl StorageManager {
} }
let message = data.get_mut(&origin).map(|&mut (ref mut total, ref mut entry)| { let message = data.get_mut(&origin).map(|&mut (ref mut total, ref mut entry)| {
let mut new_total_size = current_total_size + value.as_bytes().len(); let mut new_total_size = this_storage_size + value.as_bytes().len();
if let Some(old_value) = entry.get(&name) { if let Some(old_value) = entry.get(&name) {
new_total_size -= old_value.as_bytes().len(); new_total_size -= old_value.as_bytes().len();
} else { } else {
new_total_size += name.as_bytes().len(); new_total_size += name.as_bytes().len();
} }
if new_total_size > QUOTA_SIZE_LIMIT { if (new_total_size + other_storage_size) > QUOTA_SIZE_LIMIT {
return Err(()); return Err(());
} }