Changeset fd9d431500c57afe9d014e5d30d54b9378afc484

Timestamp:

03/11/08 02:57:18 (2 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1205200638 -0700

git-parent:

[1703d8421a3b582da45c837f42e04d1ea0e8d609]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1205200638 -0700

Message:

Additional checks on malloc output in data reader.

Files:

• modules/demux/real.c (modified) (3 diffs)

modules/demux/real.c

@@ -150 +150 @@
-    p_demux->pf_demux = Demux;
-    p_demux->pf_control = Control;
+
-    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( p_sys == NULL )
+    {
+        return VLC_ENOMEM;
+    }
-    memset( p_sys, 0, sizeof( demux_sys_t ) );
+
-    p_sys->i_data_offset = 0;
-    p_sys->i_track = 0;
@@ -1174 +1180 @@
-        case VLC_FOURCC( 'r','a','a','c' ):
-        case VLC_FOURCC( 'r','a','c','p' ):
+            fmt.i_codec = VLC_FOURCC( 'm','p','4','a' );
+
-            if( fmt.i_extra > 0 ) { fmt.i_extra--; p_peek++; }
-            if( fmt.i_extra > 0 )
-            {
-                fmt.p_extra = malloc( fmt.i_extra );
+                if( fmt.p_extra == NULL )
+                {
+                    msg_Err( p_demux, "Error in the extra data" );
+                    return VLC_EGENERIC;
+                }
-                memcpy( fmt.p_extra, p_peek, fmt.i_extra );
-            }
-
-            fmt.i_codec = VLC_FOURCC( 'm','p','4','a' );
-            break;
-
@@ -1192 +1203 @@
-            else
-                fmt.audio.i_blockalign = i_coded_frame_size;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            break;
-