highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hlsenc: fix the av_dirname path isn't include separator in the end of string

Browse Source 
Reviewed-by: Liu Steven <lq@chinaffmpeg.org>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2019-10-23 23:55:15 +08:00 committed by Steven Liu
parent 881f083a16
commit 7c872df3e1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/hlsenc.c
View File

@ -478,6 +478,12 @@ static void reflush_dynbuf(VariantStream *vs, int *range_length)
avio_write(vs->out, vs->temp_buffer, *range_length);; avio_write(vs->out, vs->temp_buffer, *range_length);;
} }
#if HAVE_DOS_PATHS
#define SEPARATOR '\\'
#else
#define SEPARATOR '/'
#endif
static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
VariantStream *vs) VariantStream *vs)
{ {
@ -544,7 +550,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
while (segment) { while (segment) {
av_log(hls, AV_LOG_DEBUG, "deleting old segment %s\n", av_log(hls, AV_LOG_DEBUG, "deleting old segment %s\n",
segment->filename); segment->filename);
path_size = (hls->use_localtime_mkdir ? 0 : strlen(dirname)) + strlen(segment->filename) + 1; path_size = (hls->use_localtime_mkdir ? 0 : strlen(dirname)+1) + strlen(segment->filename) + 1;
path = av_malloc(path_size); path = av_malloc(path_size);
if (!path) { if (!path) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
@ -554,8 +560,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
if (hls->use_localtime_mkdir) if (hls->use_localtime_mkdir)
av_strlcpy(path, segment->filename, path_size); av_strlcpy(path, segment->filename, path_size);
else { // segment->filename contains basename only else { // segment->filename contains basename only
av_strlcpy(path, dirname, path_size); snprintf(path, path_size, "%s%c%s", dirname, SEPARATOR, segment->filename);
av_strlcat(path, segment->filename, path_size);
} }
proto = avio_find_protocol_name(s->url); proto = avio_find_protocol_name(s->url);
@ -575,15 +580,14 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
if ((segment->sub_filename[0] != '\0')) { if ((segment->sub_filename[0] != '\0')) {
char *vtt_dirname_r = av_strdup(vs->vtt_avf->url); char *vtt_dirname_r = av_strdup(vs->vtt_avf->url);
vtt_dirname = (char*)av_dirname(vtt_dirname_r); vtt_dirname = (char*)av_dirname(vtt_dirname_r);
sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname); sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname) + 1;
sub_path = av_malloc(sub_path_size); sub_path = av_malloc(sub_path_size);
if (!sub_path) { if (!sub_path) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
av_strlcpy(sub_path, vtt_dirname, sub_path_size); snprintf(sub_path, sub_path_size, "%s%c%s", vtt_dirname, SEPARATOR, segment->sub_filename);
av_strlcat(sub_path, segment->sub_filename, sub_path_size);
av_freep(&vtt_dirname); av_freep(&vtt_dirname);