]> git.sesse.net Git - vlc/commitdiff
Avoid a malloc(0)
authorRémi Duraffort <ivoire@videolan.org>
Wed, 17 Sep 2008 20:00:52 +0000 (22:00 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Wed, 24 Sep 2008 20:43:01 +0000 (22:43 +0200)
modules/demux/mp4/mp4.c

index ebe914d7a1f5ffba40f37ffbf6975279698bacc4..5ad73492e5b0dc312bfb66ac40373fbf965b553c 100644 (file)
@@ -1688,9 +1688,12 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
                 if( p_avcC )
                 {
                     p_track->fmt.i_extra = p_avcC->data.p_avcC->i_avcC;
-                    p_track->fmt.p_extra = malloc( p_avcC->data.p_avcC->i_avcC );
-                    memcpy( p_track->fmt.p_extra, p_avcC->data.p_avcC->p_avcC,
-                            p_track->fmt.i_extra );
+                    if( p_track->fmt.i_extra > 0 )
+                    {
+                        p_track->fmt.p_extra = malloc( p_avcC->data.p_avcC->i_avcC );
+                        memcpy( p_track->fmt.p_extra, p_avcC->data.p_avcC->p_avcC,
+                                p_track->fmt.i_extra );
+                    }
                 }
                 else
                 {