* [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
@ 2023-03-10 13:45 Anton Khirnov
2023-03-10 14:44 ` Zhao Zhili
0 siblings, 1 reply; 5+ messages in thread
From: Anton Khirnov @ 2023-03-10 13:45 UTC (permalink / raw)
To: ffmpeg-devel
Fixes #10243
---
fftools/ffmpeg_mux_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index b3cc502fdd..09d24ba8e5 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -2063,7 +2063,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
if (next)
*next++ = 0;
- if (!memcmp(p, "chapters", 8)) {
+ if (strstr(p, "chapters") == p) {
AVChapter * const *ch = mux->fc->chapters;
unsigned int nb_ch = mux->fc->nb_chapters;
int j;
--
2.39.1
_______________________________________________
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] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
2023-03-10 13:45 [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing Anton Khirnov
@ 2023-03-10 14:44 ` Zhao Zhili
2023-03-11 10:37 ` Anton Khirnov
0 siblings, 1 reply; 5+ messages in thread
From: Zhao Zhili @ 2023-03-10 14:44 UTC (permalink / raw)
To: 'FFmpeg development discussions and patches'
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Anton Khirnov
> Sent: 2023年3月10日 21:46
> To: ffmpeg-devel@ffmpeg.org
> Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
>
> Fixes #10243
> ---
> fftools/ffmpeg_mux_init.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
> index b3cc502fdd..09d24ba8e5 100644
> --- a/fftools/ffmpeg_mux_init.c
> +++ b/fftools/ffmpeg_mux_init.c
> @@ -2063,7 +2063,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
> if (next)
> *next++ = 0;
>
> - if (!memcmp(p, "chapters", 8)) {
> + if (strstr(p, "chapters") == p) {
Does strncmp() more efficient in this case?
> AVChapter * const *ch = mux->fc->chapters;
> unsigned int nb_ch = mux->fc->nb_chapters;
> int j;
> --
> 2.39.1
>
> _______________________________________________
> 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".
_______________________________________________
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] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
2023-03-10 14:44 ` Zhao Zhili
@ 2023-03-11 10:37 ` Anton Khirnov
2023-03-11 11:45 ` Zhao Zhili
0 siblings, 1 reply; 5+ messages in thread
From: Anton Khirnov @ 2023-03-11 10:37 UTC (permalink / raw)
To: 'FFmpeg development discussions and patches'
Quoting Zhao Zhili (2023-03-10 15:44:56)
>
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Anton Khirnov
> > Sent: 2023年3月10日 21:46
> > To: ffmpeg-devel@ffmpeg.org
> > Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
> >
> > Fixes #10243
> > ---
> > fftools/ffmpeg_mux_init.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
> > index b3cc502fdd..09d24ba8e5 100644
> > --- a/fftools/ffmpeg_mux_init.c
> > +++ b/fftools/ffmpeg_mux_init.c
> > @@ -2063,7 +2063,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
> > if (next)
> > *next++ = 0;
> >
> > - if (!memcmp(p, "chapters", 8)) {
> > + if (strstr(p, "chapters") == p) {
>
> Does strncmp() more efficient in this case?
I don't see the point of optimizing this code for speed. A strncmp call
is longer and less readable IMO.
--
Anton Khirnov
_______________________________________________
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] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
2023-03-11 10:37 ` Anton Khirnov
@ 2023-03-11 11:45 ` Zhao Zhili
2023-03-12 8:30 ` Anton Khirnov
0 siblings, 1 reply; 5+ messages in thread
From: Zhao Zhili @ 2023-03-11 11:45 UTC (permalink / raw)
To: 'FFmpeg development discussions and patches'
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Anton Khirnov
> Sent: 2023年3月11日 18:37
> To: 'FFmpeg development discussions and patches' <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
>
> Quoting Zhao Zhili (2023-03-10 15:44:56)
> >
> > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Anton Khirnov
> > > Sent: 2023年3月10日 21:46
> > > To: ffmpeg-devel@ffmpeg.org
> > > Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
> > >
> > > Fixes #10243
> > > ---
> > > fftools/ffmpeg_mux_init.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
> > > index b3cc502fdd..09d24ba8e5 100644
> > > --- a/fftools/ffmpeg_mux_init.c
> > > +++ b/fftools/ffmpeg_mux_init.c
> > > @@ -2063,7 +2063,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
> > > if (next)
> > > *next++ = 0;
> > >
> > > - if (!memcmp(p, "chapters", 8)) {
> > > + if (strstr(p, "chapters") == p) {
> >
> > Does strncmp() more efficient in this case?
>
> I don't see the point of optimizing this code for speed. A strncmp call
> is longer and less readable IMO.
This is a case for the need of a strstarts(). strncmp is more intuitive than strstr()
for this job.
https://github.com/torvalds/linux/blob/master/include/linux/string.h#L215
static inline bool strstarts(const char *str, const char *prefix)
{
return strncmp(str, prefix, strlen(prefix)) == 0;
}
>
> --
> Anton Khirnov
> _______________________________________________
> 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".
_______________________________________________
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] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
2023-03-11 11:45 ` Zhao Zhili
@ 2023-03-12 8:30 ` Anton Khirnov
0 siblings, 0 replies; 5+ messages in thread
From: Anton Khirnov @ 2023-03-12 8:30 UTC (permalink / raw)
To: 'FFmpeg development discussions and patches'
Quoting Zhao Zhili (2023-03-11 12:45:30)
>
>
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Anton Khirnov
> > Sent: 2023年3月11日 18:37
> > To: 'FFmpeg development discussions and patches' <ffmpeg-devel@ffmpeg.org>
> > Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
> >
> > Quoting Zhao Zhili (2023-03-10 15:44:56)
> > >
> > > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Anton Khirnov
> > > > Sent: 2023年3月10日 21:46
> > > > To: ffmpeg-devel@ffmpeg.org
> > > > Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
> > > >
> > > > Fixes #10243
> > > > ---
> > > > fftools/ffmpeg_mux_init.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
> > > > index b3cc502fdd..09d24ba8e5 100644
> > > > --- a/fftools/ffmpeg_mux_init.c
> > > > +++ b/fftools/ffmpeg_mux_init.c
> > > > @@ -2063,7 +2063,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
> > > > if (next)
> > > > *next++ = 0;
> > > >
> > > > - if (!memcmp(p, "chapters", 8)) {
> > > > + if (strstr(p, "chapters") == p) {
> > >
> > > Does strncmp() more efficient in this case?
> >
> > I don't see the point of optimizing this code for speed. A strncmp call
> > is longer and less readable IMO.
>
> This is a case for the need of a strstarts(). strncmp is more intuitive than strstr()
> for this job.
Yes, having a "string starts with" function in stdlib would have been
nice. But as it's not there, we have to make do with what we have.
--
Anton Khirnov
_______________________________________________
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] 5+ messages in thread
end of thread, other threads:[~2023-03-12 8:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-10 13:45 [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing Anton Khirnov
2023-03-10 14:44 ` Zhao Zhili
2023-03-11 10:37 ` Anton Khirnov
2023-03-11 11:45 ` Zhao Zhili
2023-03-12 8:30 ` Anton Khirnov
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