[FFmpeg-devel] [PATCH] mxfenc: ensure mxf->body_partition_offset is not NULL before using it

[Tomas Härdin]

On Thu, 2015-03-12 at 17:48 +0100, Andreas Cadhalpun wrote:
> This fixes a crash, when trying to mux h264 into mxf_opatom.
> 
> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> ---
>  libavformat/mxfenc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> index 898951c..2891f5d 100644
> --- a/libavformat/mxfenc.c
> +++ b/libavformat/mxfenc.c
> @@ -2358,7 +2358,7 @@ static int mxf_write_footer(AVFormatContext *s)
>      mxf_write_random_index_pack(s);
> 
>      if (s->pb->seekable) {
> -        if (s->oformat == &ff_mxf_opatom_muxer){
> +        if (s->oformat == &ff_mxf_opatom_muxer && mxf->body_partition_offset){
>              /* rewrite body partition to update lengths */
>              avio_seek(pb, mxf->body_partition_offset[0], SEEK_SET);
>              if ((err = mxf_write_opatom_body_partition(s)) < 0)

Doesn't this need to happen for H.264 as well? A better solution would
be to figure out why mxf->body_partition_offset becomes NULL so that
index tables and such can be rewritten properly.

/Tomas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150313/23e365a7/attachment.asc>