mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-07-16 02:04:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

obs-ffmpeg: Fix memory corruption during cleanup

Browse Source 
We were calling avio_close on a field that might have held an
AVIOContext. This commit checks which type was allocated so we
can call the appropriate cleanup function.
This commit is contained in:
Richard Stanway
2023-03-30 20:54:56 +02:00
committed by Ryan Foster
parent e0f674de86
commit d71fa5248f
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
View File

@@ -157,6 +157,21 @@ struct ffmpeg_mux {
struct io_buffer io;
};
#define SRT_PROTO "srt"
#define UDP_PROTO "udp"
#define TCP_PROTO "tcp"
#define HTTP_PROTO "http"
#define RIST_PROTO "rist"
static bool ffmpeg_mux_is_network(struct ffmpeg_mux *ffm)
{
return !strncmp(ffm->params.file, SRT_PROTO, sizeof(SRT_PROTO) - 1) ||
!strncmp(ffm->params.file, UDP_PROTO, sizeof(UDP_PROTO) - 1) ||
!strncmp(ffm->params.file, TCP_PROTO, sizeof(TCP_PROTO) - 1) ||
!strncmp(ffm->params.file, HTTP_PROTO, sizeof(HTTP_PROTO) - 1) ||
!strncmp(ffm->params.file, RIST_PROTO, sizeof(RIST_PROTO) - 1);
}
static void header_free(struct header *header)
{
free(header->data);
@@ -167,8 +182,14 @@ static void free_avformat(struct ffmpeg_mux *ffm)
if (ffm->output) {
avcodec_free_context(&ffm->video_ctx);
if ((ffm->output->oformat->flags & AVFMT_NOFILE) == 0)
avio_close(ffm->output->pb);
if ((ffm->output->oformat->flags & AVFMT_NOFILE) == 0) {
if (!ffmpeg_mux_is_network(ffm)) {
av_free(ffm->output->pb->buffer);
avio_context_free(&ffm->output->pb);
} else {
avio_close(ffm->output->pb);
}
}
avformat_free_context(ffm->output);
ffm->output = NULL;
@@ -204,9 +225,6 @@ static void ffmpeg_mux_free(struct ffmpeg_mux *ffm)
pthread_join(ffm->io.io_thread, NULL);
// Cleanup everything else
av_free(ffm->output->pb->buffer);
avio_context_free(&ffm->output->pb);
os_event_destroy(ffm->io.new_data_available_event);
os_event_destroy(ffm->io.buffer_space_available_event);
@@ -902,21 +920,6 @@ static int ffmpeg_mux_write_av_buffer(void *opaque, uint8_t *buf, int buf_size)
return buf_size;
}
#define SRT_PROTO "srt"
#define UDP_PROTO "udp"
#define TCP_PROTO "tcp"
#define HTTP_PROTO "http"
#define RIST_PROTO "rist"
static bool ffmpeg_mux_is_network(struct ffmpeg_mux *ffm)
{
return !strncmp(ffm->params.file, SRT_PROTO, sizeof(SRT_PROTO) - 1) ||
!strncmp(ffm->params.file, UDP_PROTO, sizeof(UDP_PROTO) - 1) ||
!strncmp(ffm->params.file, TCP_PROTO, sizeof(TCP_PROTO) - 1) ||
!strncmp(ffm->params.file, HTTP_PROTO, sizeof(HTTP_PROTO) - 1) ||
!strncmp(ffm->params.file, RIST_PROTO, sizeof(RIST_PROTO) - 1);
}
static inline int open_output_file(struct ffmpeg_mux *ffm)
{
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)