From 211fb00574d41bb262d7a6bc6accc5ab149545c9 Mon Sep 17 00:00:00 2001 From: krk Date: Tue, 9 Apr 2019 21:02:03 +0200 Subject: [PATCH] Replace panic with warn in DocumentLoader.finish_load. Fix panic on broken script URL with an onerror handler that rewrites the document. --- components/script/document_loader.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs index dac891053d71..d924d6bc574d 100644 --- a/components/script/document_loader.rs +++ b/components/script/document_loader.rs @@ -167,8 +167,12 @@ impl DocumentLoader { .blocking_loads .iter() .position(|unfinished| *unfinished == *load); - self.blocking_loads - .remove(idx.unwrap_or_else(|| panic!("unknown completed load {:?}", load))); + match idx { + Some(i) => { + self.blocking_loads.remove(i); + }, + None => warn!("unknown completed load {:?}", load), + } } pub fn is_blocked(&self) -> bool {