On Wed, Aug 05, 2020 at 02:13:06PM +0100, Jack Haughton wrote: > Commit a500b975 removed NULL input handling from this function, > moving the check higher up the call tree in one branch. However, > there is another call to set_string_video_rate() which may pass > NULL, and future users of the function may not be clear that > a NULL check is required. This patch restores the NULL check to > avoid these problems. > --- > libavutil/opt.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavutil/opt.c b/libavutil/opt.c > index c8413fa5e1..bcb46451e0 100644 > --- a/libavutil/opt.c > +++ b/libavutil/opt.c > @@ -333,7 +333,10 @@ static int set_string_image_size(void *obj, const > AVOption *o, const char *val, > > static int set_string_video_rate(void *obj, const AVOption *o, const char > *val, AVRational *dst) > { > - int ret = av_parse_video_rate(dst, val); > + int ret; > + > + av_assert0(val); > + ret = av_parse_video_rate(dst, val); > if (ret < 0) > av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as > video rate\n", val); > return ret;
there are extra line breaks in the diff so git rejectes it: Applying: avutil/opt: Restore NULL input handling to set_string_video_rate() error: corrupt patch at line 10 error: could not build fake ancestor Patch failed at 0001 avutil/opt: Restore NULL input handling to set_string_video_rate() [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Does the universe only have a finite lifespan? No, its going to go on forever, its just that you wont like living in it. -- Hiranya Peiri
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".