[vlc-devel] commit: RTMP: factorization ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 17 21:10:54 2009 +0200| [25cbae45cda4530fc9968edf067fd0f59ee9d8fe] | committer: Rémi Denis-Courmont 

RTMP: factorization

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=25cbae45cda4530fc9968edf067fd0f59ee9d8fe
---

 modules/access/rtmp/access.c |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 910ed53..5aa3e47 100644
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -407,19 +407,15 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
             tmp_buffer = rtmp_encode_packet( p_sys->p_thread, rtmp_packet );
 
             i_ret = net_Write( p_sys->p_thread, p_sys->p_thread->fd, NULL, tmp_buffer, rtmp_packet->length_encoded );
+            free( rtmp_packet->body->body );
+            free( rtmp_packet->body );
+            free( rtmp_packet );
+            free( tmp_buffer );
             if( i_ret != rtmp_packet->length_encoded )
             {
-                free( rtmp_packet->body->body );
-                free( rtmp_packet->body );
-                free( rtmp_packet );
-                free( tmp_buffer );
                 msg_Err( p_access, "failed send publish start" );
                 return -1;
             }
-            free( rtmp_packet->body->body );
-            free( rtmp_packet->body );
-            free( rtmp_packet );
-            free( tmp_buffer );
         }
 
         p_access->info.i_pos += i_len_tmp;
@@ -429,19 +425,16 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
         tmp_buffer = rtmp_encode_packet( p_sys->p_thread, rtmp_packet );
  
         i_ret = net_Write( p_sys->p_thread, p_sys->p_thread->fd, NULL, tmp_buffer, rtmp_packet->length_encoded );
+        free( rtmp_packet->body->body );
+        free( rtmp_packet->body );
+        free( rtmp_packet );
+        free( tmp_buffer );
+
         if( i_ret != rtmp_packet->length_encoded )
         {
-            free( rtmp_packet->body->body );
-            free( rtmp_packet->body );
-            free( rtmp_packet );
-            free( tmp_buffer );
             msg_Err( p_access, "failed send bytes read" );
             return -1;
         }
-        free( rtmp_packet->body->body );
-        free( rtmp_packet->body );
-        free( rtmp_packet );
-        free( tmp_buffer );
     }
 
     return i_len_tmp;