LibCore+RequestServer: Ignore callbacks for cancelled network jobs

Also cancel the jobs when they're destroyed.
This makes sure that jobs whose owners have discarded don't end up
crashing because of a did_fail().

1 files changed, 9 insertions, 0 deletions

diff --git a/Userland/Libraries/LibCore/NetworkJob.cpp b/Userland/Libraries/LibCore/NetworkJob.cpp
index dd8b15ed00..c79f3085b4 100644
--- a/Userland/Libraries/LibCore/NetworkJob.cpp
+++ b/Userland/Libraries/LibCore/NetworkJob.cpp
@@ -29,6 +29,9 @@ void NetworkJob::shutdown()
 
 void NetworkJob::did_finish(NonnullRefPtr<NetworkResponse>&& response)
 {
+    if (is_cancelled())
+        return;
+
     // NOTE: We protect ourselves here, since the on_finish callback may otherwise
     //       trigger destruction of this job somehow.
     NonnullRefPtr<NetworkJob> protector(*this);
@@ -42,6 +45,9 @@ void NetworkJob::did_finish(NonnullRefPtr<NetworkResponse>&& response)
 
 void NetworkJob::did_fail(Error error)
 {
+    if (is_cancelled())
+        return;
+
     // NOTE: We protect ourselves here, since the on_finish callback may otherwise
     //       trigger destruction of this job somehow.
     NonnullRefPtr<NetworkJob> protector(*this);
@@ -55,6 +61,9 @@ void NetworkJob::did_fail(Error error)
 
 void NetworkJob::did_progress(Optional<u32> total_size, u32 downloaded)
 {
+    if (is_cancelled())
+        return;
+
     // NOTE: We protect ourselves here, since the callback may otherwise
     //       trigger destruction of this job somehow.
     NonnullRefPtr<NetworkJob> protector(*this);