From 4ba6c26623a2ba1c59adf2171308b92d04f6f7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Wed, 24 Oct 2018 15:13:07 +0200
Subject: [PATCH] Delete MessageData when a message is posted to a quitting
 MessageQueue

Bug: webrtc:9913
Change-Id: Id60f537eb0049995c9f0837e3a03ca3a3dd90577
Reviewed-on: https://webrtc-review.googlesource.com/c/107639
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25365}
---
 rtc_base/messagequeue.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rtc_base/messagequeue.cc b/rtc_base/messagequeue.cc
index d710ba58a4..204952a7e2 100644
--- a/rtc_base/messagequeue.cc
+++ b/rtc_base/messagequeue.cc
@@ -350,8 +350,10 @@ void MessageQueue::Post(const Location& posted_from,
                         uint32_t id,
                         MessageData* pdata,
                         bool time_sensitive) {
-  if (IsQuitting())
+  if (IsQuitting()) {
+    delete pdata;
     return;
+  }
 
   // Keep thread safe
   // Add the message to the end of the queue
@@ -407,6 +409,7 @@ void MessageQueue::DoDelayPost(const Location& posted_from,
                                uint32_t id,
                                MessageData* pdata) {
   if (IsQuitting()) {
+    delete pdata;
     return;
   }