summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_file_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-10-26 00:43:35 +0200
committerCarl Hetherington <cth@carlh.net>2019-10-26 00:46:08 +0200
commit592c7844e80a53aeb3a88edb4ffc2b68713a10e1 (patch)
treebdcf276f8d95d9a3cfae09fd4d7ef0672a05cdca /src/lib/ffmpeg_file_encoder.cc
parentc6dba8368b45b6177a971050236d37da0ce4ff4c (diff)
Prevent calls to erase with invalid keys.
Diffstat (limited to 'src/lib/ffmpeg_file_encoder.cc')
-rw-r--r--src/lib/ffmpeg_file_encoder.cc5
1 files changed, 4 insertions, 1 deletions
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);
+ }
}