Changeset a74d5452eb0c1b7846e14090c1063169ebd9681a

Timestamp:

03/04/08 15:35:01 (6 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1204641301 +0100

git-parent:

[93b4565847b0f951ac5cf036d14d5b0544cfe64c]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1204481576 +0100

Message:

Check malloc return values and small cleanup.

Files:

• modules/packetizer/mpeg4audio.c (modified) (19 diffs)

modules/packetizer/mpeg4audio.c

@@ -141 +141 @@
-
-enum {
-
-    STATE_NOSYNC,
-    STATE_SYNC,
@@ -250 +249 @@
-        p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra;
-        p_dec->fmt_out.p_extra = malloc( p_dec->fmt_in.i_extra );
+        if( !p_dec->fmt_out.p_extra )
+        {
+            p_dec->fmt_out.i_extra = 0;
+            return VLC_ENOMEM;
+        }
-        memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra,
-                p_dec->fmt_in.i_extra );
@@ -353 +357 @@
-    if( !p_dec->fmt_out.i_extra )
-    {
+        p_dec->fmt_out.p_extra = malloc( 2 );
+        if( !p_dec->fmt_out.p_extra )
+        {
+            p_dec->fmt_out.i_extra = 0;
+            return 0;
+        }
-        p_dec->fmt_out.i_extra = 2;
-        p_dec->fmt_out.p_extra = malloc( 2 );
-        ((uint8_t *)p_dec->fmt_out.p_extra)[0] =
-            (i_profile + 1) << 3 | (i_sample_rate_idx >> 1);
@@ -366 +375 @@
-    return i_frame_size - *pi_header_size;
-}
+
-/****************************************************************************
- * LOAS helpers
@@ -374 +384 @@
-    return ( ( p_header[1] & 0x1f ) << 8 ) + p_header[2];
-}
+
-static int Mpeg4GAProgramConfigElement( bs_t *s )
-{
@@ -406 +417 @@
-    return 0;
-}
+
-static int Mpeg4GASpecificConfig( mpeg4_cfg_t *p_cfg, bs_t *s )
-{
@@ -437 +449 @@
-    return 0;
-}
+
-static int Mpeg4ReadAudioObjectType( bs_t *s )
-{
@@ -444 +457 @@
-    return i_type;
-}
+
-static int Mpeg4ReadAudioSamplerate( bs_t *s )
-{
@@ -451 +465 @@
-    return bs_read( s, 24 );
-}
+
-static int Mpeg4ReadAudioSpecificInfo( mpeg4_cfg_t *p_cfg, int *pi_extra, uint8_t *p_extra, bs_t *s, int i_max_size )
-{
@@ -480 +495 @@
-    memset( p_cfg, 0, sizeof(*p_cfg) );
-    *pi_extra = 0;
-
+
-    p_cfg->i_object_type = Mpeg4ReadAudioObjectType( s );
-    p_cfg->i_samplerate = Mpeg4ReadAudioSamplerate( s );
@@ -566 +581 @@
-        break;
-    }
+
-    if( p_cfg->extension.i_object_type != 5 && i_max_size > 0 && i_max_size - (bs_pos(s) - i_pos_start) >= 16 && 
-        bs_read( s, 11 ) == 0x2b7 )
@@ -734 +750 @@
-    if( !bs_read1( &s ) )
-    {
-
+
+
-        {
-            const latm_stream_t *st = &p_sys->latm.stream[0];
@@ -747 +764 @@
-                p_dec->fmt_out.i_extra = st->i_extra;
-                p_dec->fmt_out.p_extra = malloc( st->i_extra );
+                if( !p_dec->fmt_out.p_extra )
+                {
+                    p_dec->fmt_out.i_extra = 0;
+                    return 0;
+                }
-                memcpy( p_dec->fmt_out.p_extra, st->extra, st->i_extra );
-            }
@@ -790 +812 @@
-                        pi_payload[i_program][i_layer] = st->i_frame_length / 8; /* XXX not correct */
-                    }
-
+
+
+
-                    {
-                        bs_skip( &s, 2 ); // muxSlotLengthCoded
@@ -857 +881 @@
-                    pi_payload[i_program][i_layer] = st->i_frame_length / 8; /* XXX not correct */
-                }
-
+
+
+
-                {
-                    bs_read( &s, 2 ); // muxSlotLengthCoded
@@ -1016 +1042 @@
-            /* TODO: If p_block == NULL, flush the buffer without checking the
-             * next sync word */
+            if( p_sys->bytestream.p_block == NULL )
+            {
+                p_sys->i_state = STATE_NOSYNC;
+                block_BytestreamFlush( &p_sys->bytestream );
+                return NULL;
+            }
-
-            /* Check if next expected frame contains the sync word */
@@ -1026 +1058 @@
-            }
-
-
-
-
+
+
+
+
+
-            {
-                msg_Dbg( p_dec, "emulated sync word "
@@ -1105 +1139 @@
-}
-
-
-/*****************************************************************************
- * SetupBuffer:
@@ -1152 +1185 @@
-    free( p_dec->p_sys );
-}
-
-