Changeset 456bdd9fa8cd8bd665a1c7f0d9a71a6b87bb7efc

Timestamp:

15/02/08 18:14:19 (10 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1203095659 +0000

git-parent:

[4d12ba40ff9a83fa9994e4d3611c543f0878cb83]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1203095659 +0000

Message:

Fix two more calloc-based denial of service in the MP4 demux.

Files:

• modules/demux/mp4/mp4.c (modified) (2 diffs)

modules/demux/mp4/mp4.c

@@ -486 +486 @@
-    /* allocate memory */
-    p_sys->track = calloc( p_sys->i_tracks, sizeof( mp4_track_t ) );
+    if( p_sys->track == NULL )
+        goto error;
-    memset( p_sys->track, 0, p_sys->i_tracks * sizeof( mp4_track_t ) );
-
@@ -1233 +1235 @@
-        p_demux_track->p_sample_size =
-            calloc( p_demux_track->i_sample_count, sizeof( uint32_t ) );
+        if( p_demux_track->p_sample_size == NULL )
+            return VLC_ENOMEM;
-
-        for( i_sample = 0; i_sample < p_demux_track->i_sample_count; i_sample++ )