From: Carl Hetherington <cth@carlh.net>
Date: Fri, 25 Oct 2019 22:43:35 +0000 (+0200)
Subject: Prevent calls to erase with invalid keys.
X-Git-Tag: v2.14.12^2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=592c7844e80a53aeb3a88edb4ffc2b68713a10e1

Prevent calls to erase with invalid keys.
---

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 5eccb8f17..d7a56f01e 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -378,5 +378,8 @@ FFmpegFileEncoder::buffer_free (void* opaque, uint8_t* data)
 void
 FFmpegFileEncoder::buffer_free2 (uint8_t* data)
 {
-	_pending_images.erase (data);
+	/* XXX: does this need a lock to prevent cross-thread access to _pending_images? */
+	if (_pending_images.find(data) != _pending_images.end()) {
+		_pending_images.erase (data);
+	}
 }