[x264-devel] flv: Fix memory and file handle leaks

[Henrik Gramner]

x264 | branch: master | Henrik Gramner <henrik at gramner.com> | Wed Jun 24 00:22:56 2015 +0200| [250d5b0e13045f6a1ebfeb379933b5c5daa9cf41] | committer: Anton Mitrofanov

flv: Fix memory and file handle leaks

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=250d5b0e13045f6a1ebfeb379933b5c5daa9cf41
---

 output/flv.c |   37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/output/flv.c b/output/flv.c
index 10b9533..00a6afc 100644
--- a/output/flv.c
+++ b/output/flv.c
@@ -75,21 +75,29 @@ static int write_header( flv_buffer *c )
 
 static int open_file( char *psz_filename, hnd_t *p_handle, cli_output_opt_t *opt )
 {
-    *p_handle = NULL;
     flv_hnd_t *p_flv = calloc( 1, sizeof(flv_hnd_t) );
-    if( !p_flv )
-        return -1;
-
-    p_flv->b_dts_compress = opt->use_dts_compress;
-
-    p_flv->c = flv_create_writer( psz_filename );
-    if( !p_flv->c )
-        return -1;
-
-    CHECK( write_header( p_flv->c ) );
-    *p_handle = p_flv;
+    if( p_flv )
+    {
+        flv_buffer *c = flv_create_writer( psz_filename );
+        if( c )
+        {
+            if( !write_header( c ) )
+            {
+                p_flv->c = c;
+                p_flv->b_dts_compress = opt->use_dts_compress;
+                *p_handle = p_flv;
+                return 0;
+            }
+
+            fclose( c->fp );
+            free( c->data );
+            free( c );
+        }
+        free( p_flv );
+    }
 
-    return 0;
+    *p_handle = NULL;
+    return -1;
 }
 
 static int set_param( hnd_t handle, x264_param_t *p_param )
@@ -326,8 +334,9 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest
     }
 
     fclose( c->fp );
-    free( p_flv );
+    free( c->data );
     free( c );
+    free( p_flv );
 
     return 0;
 }