From: Rafaël Carré <funman@videolan.org>
Date: Wed, 12 Mar 2008 15:23:26 +0000 (+0100)
Subject: verify asprintf() return value, fix indentation
X-Git-Tag: 0.9.0-test0~2148
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e7003c92f06a1c667c3ce570d2c5eb6eecbc5dde;p=vlc

verify asprintf() return value, fix indentation
---

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index b9c7dfd33b..054e1df1a4 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -348,23 +348,25 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
             p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
         {
-          input_thread_t *p_input = (input_thread_t *)p_dec->p_parent;
-          char *psz_cat;
-          const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
+            input_thread_t *p_input = (input_thread_t *)p_dec->p_parent;
+            char *psz_cat;
+            const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
                                     frame.sbr ? "SBR" : "PS";
 
-          msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
-                   psz_ext, frame.channels, frame.samplerate );
-
-          asprintf( &psz_cat, _("Stream %d"), p_dec->fmt_in.i_id );
-          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
-                          _("AAC extension"), "%s", psz_ext );
-          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
-                         _("Channels"), "%d", frame.channels );
-          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
-                         _("Sample rate"), _("%d Hz"), frame.samplerate );
-          free( psz_cat );
-          p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
+            msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
+                    psz_ext, frame.channels, frame.samplerate );
+
+            if( asprintf( &psz_cat, _("Stream %d"), p_dec->fmt_in.i_id ) != -1 )
+            {
+                input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                            _("AAC extension"), "%s", psz_ext );
+                input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                            _("Channels"), "%d", frame.channels );
+                input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                            _("Sample rate"), _("%d Hz"), frame.samplerate );
+                free( psz_cat );
+            }
+            p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
         }
 
         /* Convert frame.channel_position to our own channel values */