On 06/21/2013 03:26 PM, Nicolas Bertrand wrote:
> From: Michael Niedermayer <[email protected]>
> 
> Fixes null pointer dereference
> 
> Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
> Signed-off-by: Michael Niedermayer <[email protected]>
> 
> Conflicts:
> 
>       libavcodec/j2kdec.c
> ---
>  libavcodec/jpeg2000dec.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
> index a8dae3e..4ef0e8b 100644
> --- a/libavcodec/jpeg2000dec.c
> +++ b/libavcodec/jpeg2000dec.c
> @@ -1180,6 +1180,8 @@ static int 
> jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
>          switch (marker) {
>          case JPEG2000_SIZ:
>              ret = get_siz(s);
> +            if (!s->tile)
> +                s->numXtiles = s->numYtiles = 0;

Looks fishy, what is get_siz is supposed to do?

lu
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to