jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-ffmpeg, obs-outputs: Check return of obs_encoder_get_extra_data

Browse Source 
A race condition can occur in obs-outputs where the send_thread is in
the process of (re)connecting but the encoder was shut down in the
meantime. This causes the expected header data to be garbage, resulting
in a crash.
This commit is contained in:
Richard Stanway 2022-06-19 23:08:06 +02:00 committed by Jim
parent 066f0defcf
commit 17c39ccb07
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,7 +638,8 @@ static bool send_audio_headers(struct ffmpeg_muxer *stream,
struct encoder_packet packet = {
.type = OBS_ENCODER_AUDIO, .timebase_den = 1, .track_idx = idx};
obs_encoder_get_extra_data(aencoder, &packet.data, &packet.size);
if (!obs_encoder_get_extra_data(aencoder, &packet.data, &packet.size))
return false;
return write_packet(stream, &packet);
}
@ -649,7 +650,8 @@ static bool send_video_headers(struct ffmpeg_muxer *stream)
struct encoder_packet packet = {.type = OBS_ENCODER_VIDEO,
.timebase_den = 1};
obs_encoder_get_extra_data(vencoder, &packet.data, &packet.size);
if (!obs_encoder_get_extra_data(vencoder, &packet.data, &packet.size))
return false;
return write_packet(stream, &packet);
}

6
plugins/obs-outputs/flv-output.c
View File

@ -119,7 +119,8 @@ static void write_audio_header(struct flv_output *stream)
struct encoder_packet packet = {.type = OBS_ENCODER_AUDIO,
.timebase_den = 1};
obs_encoder_get_extra_data(aencoder, &packet.data, &packet.size);
if (!obs_encoder_get_extra_data(aencoder, &packet.data, &packet.size))
return;
write_packet(stream, &packet, true);
}
@ -133,7 +134,8 @@ static void write_video_header(struct flv_output *stream)
struct encoder_packet packet = {
.type = OBS_ENCODER_VIDEO, .timebase_den = 1, .keyframe = true};
obs_encoder_get_extra_data(vencoder, &header, &size);
if (!obs_encoder_get_extra_data(vencoder, &header, &size))
return;
packet.size = obs_parse_avc_header(&packet.data, header, size);
write_packet(stream, &packet, true);
bfree(packet.data);

3
plugins/obs-outputs/ftl-stream.c
View File

@ -553,7 +553,8 @@ static bool send_video_header(struct ftl_stream *stream, int64_t dts_usec)
.keyframe = true,
.dts_usec = dts_usec};
obs_encoder_get_extra_data(vencoder, &header, &size);
if (!obs_encoder_get_extra_data(vencoder, &header, &size))
return false;
packet.size = obs_parse_avc_header(&packet.data, header, size);
return send_packet(stream, &packet, true) >= 0;
}

6
plugins/obs-outputs/rtmp-stream.c
View File

@ -804,7 +804,8 @@ static bool send_audio_header(struct rtmp_stream *stream, size_t idx,
return true;
}
obs_encoder_get_extra_data(aencoder, &header, &packet.size);
if (!obs_encoder_get_extra_data(aencoder, &header, &packet.size))
return false;
packet.data = bmemdup(header, packet.size);
return send_packet(stream, &packet, true, idx) >= 0;
}
@ -819,7 +820,8 @@ static bool send_video_header(struct rtmp_stream *stream)
struct encoder_packet packet = {
.type = OBS_ENCODER_VIDEO, .timebase_den = 1, .keyframe = true};
obs_encoder_get_extra_data(vencoder, &header, &size);
if (!obs_encoder_get_extra_data(vencoder, &header, &size))
return false;
packet.size = obs_parse_avc_header(&packet.data, header, size);
return send_packet(stream, &packet, true, 0) >= 0;
}