| Message ID | 20200408013428.19494-1-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Commit | 52bd9342dc90edac22994f37a092ba9d4be1bdaa |
| Headers | show |
| Series | [FFmpeg-devel,v3] avformat/dashenc: remove the arbitrary restrictions for filename | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
lance.lmwang@gmail.com: > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavformat/dashenc.c | 26 +++++++++----------------- > 1 file changed, 9 insertions(+), 17 deletions(-) > > diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c > index 94d463972a..903fdd0aa6 100644 > --- a/libavformat/dashenc.c > +++ b/libavformat/dashenc.c > @@ -1832,28 +1832,20 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) { > static int dashenc_delete_segment_file(AVFormatContext *s, const char* file) > { > DASHContext *c = s->priv_data; > - size_t dirname_len, file_len; > - char filename[1024]; > - > - dirname_len = strlen(c->dirname); > - 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", > - (uint64_t)dirname_len, c->dirname); > - return AVERROR(ENAMETOOLONG); > - } > + AVBPrint buf; > > - memcpy(filename, c->dirname, dirname_len); > + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); > > - 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); > + av_bprintf(&buf, "%s%s", c->dirname, file); > + if (!av_bprint_is_complete(&buf)) { > + av_bprint_finalize(&buf, NULL); > + av_log(s, AV_LOG_WARNING, "Out of memory for filename\n"); > + return AVERROR(ENOMEM); > } > > - memcpy(filename + dirname_len, file, file_len + 1); // include the terminating zero > - dashenc_delete_file(s, filename); > + dashenc_delete_file(s, buf.str); > > + av_bprint_finalize(&buf, NULL); > return 0; > } > > Looks good now. - Andreas
On Wed, Apr 08, 2020 at 08:45:09AM +0200, Andreas Rheinhardt wrote: > lance.lmwang@gmail.com: > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavformat/dashenc.c | 26 +++++++++----------------- > > 1 file changed, 9 insertions(+), 17 deletions(-) > > > > diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c > > index 94d463972a..903fdd0aa6 100644 > > --- a/libavformat/dashenc.c > > +++ b/libavformat/dashenc.c > > @@ -1832,28 +1832,20 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) { > > static int dashenc_delete_segment_file(AVFormatContext *s, const char* file) > > { > > DASHContext *c = s->priv_data; > > - size_t dirname_len, file_len; > > - char filename[1024]; > > - > > - dirname_len = strlen(c->dirname); > > - 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", > > - (uint64_t)dirname_len, c->dirname); > > - return AVERROR(ENAMETOOLONG); > > - } > > + AVBPrint buf; > > > > - memcpy(filename, c->dirname, dirname_len); > > + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); > > > > - 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); > > + av_bprintf(&buf, "%s%s", c->dirname, file); > > + if (!av_bprint_is_complete(&buf)) { > > + av_bprint_finalize(&buf, NULL); > > + av_log(s, AV_LOG_WARNING, "Out of memory for filename\n"); > > + return AVERROR(ENOMEM); > > } > > > > - memcpy(filename + dirname_len, file, file_len + 1); // include the terminating zero > > - dashenc_delete_file(s, filename); > > + dashenc_delete_file(s, buf.str); > > > > + av_bprint_finalize(&buf, NULL); > > return 0; > > } > > > > > Looks good now. will apply. thx. > > - Andreas > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 94d463972a..903fdd0aa6 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1832,28 +1832,20 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) { static int dashenc_delete_segment_file(AVFormatContext *s, const char* file) { DASHContext *c = s->priv_data; - size_t dirname_len, file_len; - char filename[1024]; - - dirname_len = strlen(c->dirname); - 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", - (uint64_t)dirname_len, c->dirname); - return AVERROR(ENAMETOOLONG); - } + AVBPrint buf; - memcpy(filename, c->dirname, dirname_len); + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); - 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); + av_bprintf(&buf, "%s%s", c->dirname, file); + if (!av_bprint_is_complete(&buf)) { + av_bprint_finalize(&buf, NULL); + av_log(s, AV_LOG_WARNING, "Out of memory for filename\n"); + return AVERROR(ENOMEM); } - memcpy(filename + dirname_len, file, file_len + 1); // include the terminating zero - dashenc_delete_file(s, filename); + dashenc_delete_file(s, buf.str); + av_bprint_finalize(&buf, NULL); return 0; }