[FFmpeg-devel] [PATCH 1/3] avfilter/ass: make sure the log level are in available range

[Michael Niedermayer]

On Thu, Sep 11, 2014 at 09:13:29PM +0200, Clément Bœsch wrote:
> ---
>  libavfilter/vf_subtitles.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
> index 4fa1174..44273cb 100644
> --- a/libavfilter/vf_subtitles.c
> +++ b/libavfilter/vf_subtitles.c
> @@ -80,7 +80,9 @@ static const int ass_libavfilter_log_level_map[] = {
>  
>  static void ass_log(int ass_level, const char *fmt, va_list args, void *ctx)
>  {
> -    int level = ass_libavfilter_log_level_map[ass_level];
> +    const int ass_level_clip = av_clip(ass_level, 0,
> +        FF_ARRAY_ELEMS(ass_libavfilter_log_level_map) - 1);
> +    const int level = ass_libavfilter_log_level_map[ass_level_clip];

LGTM

btw, in
    [2] = AV_LOG_WARNING,   /* MSGL_WARN */
    [3] = AV_LOG_WARNING,   /* <undefined> */
    [4] = AV_LOG_INFO,      /* MSGL_INFO */
    [5] = AV_LOG_INFO,      /* <undefined> */
    [6] = AV_LOG_VERBOSE,   /* MSGL_V */

AV_LOG levels have finer level values than the named identifers
so it would be possible to use different levels instead of using
info and warning twice

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Breaking DRM is a little like attempting to break through a door even
though the window is wide open and the only thing in the house is a bunch
of things you dont want and which you would get tomorrow for free anyway
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140911/44557d4b/attachment.asc>