diff options
author | Mark H Weaver <mhw@netris.org> | 2016-05-12 18:48:36 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-05-12 18:48:36 -0400 |
commit | 207c604637737408a3d4cd9214a9e69ce4b21bb3 (patch) | |
tree | c26225dd535e59866677b1dda1d1714b95f417a5 /gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch | |
parent | 11d7d7b5d399f38712eb68ab9a20e5dc0d6ef30e (diff) | |
parent | ef06d54a9b9ee4fb5015c78ab94f8df1d3a72f1d (diff) |
Merge branch 'gnome-updates'
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch')
-rw-r--r-- | gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch b/gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch deleted file mode 100644 index 0a6bee378b..0000000000 --- a/gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch +++ /dev/null @@ -1,35 +0,0 @@ -Copied from https://hg.mozilla.org/releases/mozilla-esr38/raw-rev/e7c23c08bf84 - -# HG changeset patch -# User Randell Jesup <rjesup@jesup.org> -# Date 1458543433 14400 -# Node ID e7c23c08bf84a02d9154f31e0c5d121a45884a69 -# Parent a6de1f453712edabff597879398606708c191098 -Bug 1254876: assert windows recording is shut down r=pkerr a=ritu - -MozReview-Commit-ID: JRqxBb5TgrE - -diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/win/audio_device_core_win.cc b/media/webrtc/trunk/webrtc/modules/audio_device/win/audio_device_core_win.cc ---- a/media/webrtc/trunk/webrtc/modules/audio_device/win/audio_device_core_win.cc -+++ b/media/webrtc/trunk/webrtc/modules/audio_device/win/audio_device_core_win.cc -@@ -567,16 +567,19 @@ AudioDeviceWindowsCore::AudioDeviceWindo - // ---------------------------------------------------------------------------- - - AudioDeviceWindowsCore::~AudioDeviceWindowsCore() - { - WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); - - Terminate(); - -+ // Recording thread should be shut down before this! -+ assert(_hRecThread == NULL); -+ - // The IMMDeviceEnumerator is created during construction. Must release - // it here and not in Terminate() since we don't recreate it in Init(). - SAFE_RELEASE(_ptrEnumerator); - - _ptrAudioBuffer = NULL; - - if (NULL != _hRenderSamplesReadyEvent) - { - |