* [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated @ 2023-04-13 1:53 James Almer 2023-04-13 1:53 ` [FFmpeg-devel] [PATCH 2/2] avutil/wchar_filename: propagate MultiByteToWideChar() failures James Almer 2023-04-14 12:15 ` [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated James Almer 0 siblings, 2 replies; 4+ messages in thread From: James Almer @ 2023-04-13 1:53 UTC (permalink / raw) To: ffmpeg-devel Fixes ticket #10304 Signed-off-by: James Almer <jamrial@gmail.com> --- libavformat/concat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/concat.c b/libavformat/concat.c index dc0985e40c..825e43a7fa 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -296,6 +296,8 @@ static av_cold int concatf_open(URLContext *h, const char *uri, int flags) av_bprint_finalize(&bp, NULL); data->length = i; + if (!data->length) + err = AVERROR_INVALIDDATA; if (err < 0) concat_close(h); -- 2.40.0 _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] avutil/wchar_filename: propagate MultiByteToWideChar() failures 2023-04-13 1:53 [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated James Almer @ 2023-04-13 1:53 ` James Almer 2023-04-13 2:11 ` [FFmpeg-devel] [PATCH 2/2 v2] avutil/wchar_filename: propagate MultiByteToWideChar() and WideCharToMultiByte() failures James Almer 2023-04-14 12:15 ` [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated James Almer 1 sibling, 1 reply; 4+ messages in thread From: James Almer @ 2023-04-13 1:53 UTC (permalink / raw) To: ffmpeg-devel Don't return success if the string could not be converted. Signed-off-by: James Almer <jamrial@gmail.com> --- libavutil/wchar_filename.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 9a04a069f1..27b93d0f89 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -32,7 +32,8 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) num_chars = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename_utf8, -1, NULL, 0); if (num_chars <= 0) { *filename_w = NULL; - return 0; + errno = EINVAL; + return -1; } *filename_w = (wchar_t *)av_calloc(num_chars, sizeof(wchar_t)); if (!*filename_w) { -- 2.40.0 _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH 2/2 v2] avutil/wchar_filename: propagate MultiByteToWideChar() and WideCharToMultiByte() failures 2023-04-13 1:53 ` [FFmpeg-devel] [PATCH 2/2] avutil/wchar_filename: propagate MultiByteToWideChar() failures James Almer @ 2023-04-13 2:11 ` James Almer 0 siblings, 0 replies; 4+ messages in thread From: James Almer @ 2023-04-13 2:11 UTC (permalink / raw) To: ffmpeg-devel Don't return success if the string could not be converted. Signed-off-by: James Almer <jamrial@gmail.com> --- libavutil/wchar_filename.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 9a04a069f1..fbc0a55146 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -32,7 +32,8 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) num_chars = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename_utf8, -1, NULL, 0); if (num_chars <= 0) { *filename_w = NULL; - return 0; + errno = EINVAL; + return -1; } *filename_w = (wchar_t *)av_calloc(num_chars, sizeof(wchar_t)); if (!*filename_w) { @@ -52,7 +53,8 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, NULL, 0, NULL, NULL); if (num_chars <= 0) { *filename = NULL; - return 0; + errno = EINVAL; + return -1; } *filename = (char*)av_malloc_array(num_chars, sizeof *filename); if (!*filename) { -- 2.40.0 _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated 2023-04-13 1:53 [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated James Almer 2023-04-13 1:53 ` [FFmpeg-devel] [PATCH 2/2] avutil/wchar_filename: propagate MultiByteToWideChar() failures James Almer @ 2023-04-14 12:15 ` James Almer 1 sibling, 0 replies; 4+ messages in thread From: James Almer @ 2023-04-14 12:15 UTC (permalink / raw) To: ffmpeg-devel On 4/12/2023 10:53 PM, James Almer wrote: > Fixes ticket #10304 > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavformat/concat.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavformat/concat.c b/libavformat/concat.c > index dc0985e40c..825e43a7fa 100644 > --- a/libavformat/concat.c > +++ b/libavformat/concat.c > @@ -296,6 +296,8 @@ static av_cold int concatf_open(URLContext *h, const char *uri, int flags) > av_bprint_finalize(&bp, NULL); > data->length = i; > > + if (!data->length) > + err = AVERROR_INVALIDDATA; > if (err < 0) > concat_close(h); Will apply set. _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-14 12:15 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-04-13 1:53 [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated James Almer 2023-04-13 1:53 ` [FFmpeg-devel] [PATCH 2/2] avutil/wchar_filename: propagate MultiByteToWideChar() failures James Almer 2023-04-13 2:11 ` [FFmpeg-devel] [PATCH 2/2 v2] avutil/wchar_filename: propagate MultiByteToWideChar() and WideCharToMultiByte() failures James Almer 2023-04-14 12:15 ` [FFmpeg-devel] [PATCH 1/2] avformat/concatf: check if any nodes were allocated James Almer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git