Do not add null task observers

Potential fix for: flutter/flutter#38778
iskakaushik · Aug 20, 2019 · 4e90327 · 4e90327
1 parent 251e280
commit 4e90327
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/fml/merged_queues_runner.cc b/fml/merged_queues_runner.cc
@@ -17,7 +17,7 @@ class MessageLoopTaskQueues::MergedQueuesRunner {
                      TaskQueueId owner,
                      MutexType type = MutexType::kTasks)
       : owner_(owner),
-        subsumed_(task_queues_._kUnmerged),
+        subsumed_(MessageLoopTaskQueues::_kUnmerged),
         task_queues_(task_queues),
         type_(type) {
     task_queues_.GetMutex(owner, type).lock();

diff --git a/fml/message_loop_impl.cc b/fml/message_loop_impl.cc
@@ -64,7 +64,11 @@ void MessageLoopImpl::AddTaskObserver(intptr_t key, fml::closure callback) {
   FML_DCHECK(MessageLoop::GetCurrent().GetLoopImpl().get() == this)
       << "Message loop task observer must be added on the same thread as the "
          "loop.";
-  task_queue_->AddTaskObserver(queue_id_, key, callback);
+  if (callback != null) {
+    task_queue_->AddTaskObserver(queue_id_, key, callback);
+  } else {
+    FML_LOG(ERROR) << "Tried to add a null TaskObserver.";
+  }
 }
 
 void MessageLoopImpl::RemoveTaskObserver(intptr_t key) {

diff --git a/fml/message_loop_task_queues.cc b/fml/message_loop_task_queues.cc
@@ -125,6 +125,7 @@ size_t MessageLoopTaskQueues::GetNumPendingTasks(TaskQueueId queue_id) {
 void MessageLoopTaskQueues::AddTaskObserver(TaskQueueId queue_id,
                                             intptr_t key,
                                             fml::closure callback) {
+  FML_DCHECK(callback != nullptr) << "Observer callback must be non-null.";
   std::scoped_lock lock(GetMutex(queue_id, MutexType::kObservers));
   task_observers_[queue_id][key] = std::move(callback);
 }