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

avformat/dashenc: remove the arbitrary restrictions for filename

Browse Source 
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2020-04-08 09:34:28 +08:00
parent 1726eefec6
commit 52bd9342dc
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/dashenc.c
View File

@ -1850,28 +1850,20 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) {
static int dashenc_delete_segment_file(AVFormatContext *s, const char* file) static int dashenc_delete_segment_file(AVFormatContext *s, const char* file)
{ {
DASHContext *c = s->priv_data; DASHContext *c = s->priv_data;
size_t dirname_len, file_len; AVBPrint buf;
char filename[1024];
dirname_len = strlen(c->dirname); av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
if (dirname_len >= sizeof(filename)) {
av_log(s, AV_LOG_WARNING, "Cannot delete segments as the directory path is too long: %"PRIu64" characters: %s\n", av_bprintf(&buf, "%s%s", c->dirname, file);
(uint64_t)dirname_len, c->dirname); if (!av_bprint_is_complete(&buf)) {
return AVERROR(ENAMETOOLONG); av_bprint_finalize(&buf, NULL);
av_log(s, AV_LOG_WARNING, "Out of memory for filename\n");
return AVERROR(ENOMEM);
} }
memcpy(filename, c->dirname, dirname_len); dashenc_delete_file(s, buf.str);
file_len = strlen(file);
if ((dirname_len + file_len) >= sizeof(filename)) {
av_log(s, AV_LOG_WARNING, "Cannot delete segments as the path is too long: %"PRIu64" characters: %s%s\n",
(uint64_t)(dirname_len + file_len), c->dirname, file);
return AVERROR(ENAMETOOLONG);
}
memcpy(filename + dirname_len, file, file_len + 1); // include the terminating zero
dashenc_delete_file(s, filename);
av_bprint_finalize(&buf, NULL);
return 0; return 0;
} }