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:44:17 +0200
commitd0e783406f1bcfdeea5d21419dee024b53252f32 (patch)
tree92fa1cd866f3cc3051aaf93cdb3cc56dc6b3dcb2 /src/lib/ffmpeg_file_encoder.cc
parent21b2e5d0e658cfc664a70a41ef9c4c2970f01f28 (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 cd5d473f9..e6f38df35 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -422,5 +422,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);
+ }
}