[FFmpeg-devel] [PATCH] lavf/ffmdec: return proper error code in ffm2_read_header()

[Michael Niedermayer]

On Mon, Sep 01, 2014 at 02:05:56PM +0200, Stefano Sabatini wrote:
> ---
>  libavformat/ffmdec.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
> index f8fee2f..d74b6cf 100644
> --- a/libavformat/ffmdec.c
> +++ b/libavformat/ffmdec.c
> @@ -238,8 +238,12 @@ static int ffm2_read_header(AVFormatContext *s)
>      AVCodecContext *codec;
>  
>      ffm->packet_size = avio_rb32(pb);
> -    if (ffm->packet_size != FFM_PACKET_SIZE)
> +    if (ffm->packet_size != FFM_PACKET_SIZE) {
> +        av_log(s, AV_LOG_ERROR, "Invalid packet size %d, expected was %d\n",
> +               ffm->packet_size, FFM_PACKET_SIZE);
> +        ret = AVERROR(EINVAL);

theres no ret variable in the function
is some hunk missing ?

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

When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato
-------------- 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/20140901/5e45dd9f/attachment.asc>