MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/hlsenc: Handled error from ff_http_do_new_request() function

Browse Source 
This patch fixes the segmentation fault issues due to
unhandled errors from ff_http_do_new_request function.

Reviewed-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Karthick J 2018-12-10 14:17:55 +08:00 committed by Steven Liu
parent 1c96d2e399
commit 56503a6925
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/hlsenc.c
View File

@ -241,6 +241,9 @@ static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
URLContext *http_url_context = ffio_geturlcontext(*pb);
av_assert0(http_url_context);
err = ff_http_do_new_request(http_url_context, filename);
if (err < 0)
ff_format_io_close(s, pb);
#endif
}
return err;
@ -249,6 +252,8 @@ static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) {
HLSContext *hls = s->priv_data;
int http_base_proto = filename ? ff_is_http_proto(filename) : 0;
if (!*pb)
return;
if (!http_base_proto || !hls->http_persistent || hls->key_info_file || hls->encrypt) {
ff_format_io_close(s, pb);
#if CONFIG_HTTP_PROTOCOL
@ -2329,7 +2334,8 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
}
vs->packets_written++;
ret = ff_write_chained(oc, stream_index, pkt, s, 0);
if (oc->pb)
ret = ff_write_chained(oc, stream_index, pkt, s, 0);
return ret;
}