Changeset cdb07b55d30df5aefda222f6e9f5099e6f5d8fd9

Timestamp:

05/09/08 22:59:27 (4 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1210366767 +0200

git-parent:

[3ad6ea967fe0ae37c01b6883599319e7ee37c0fc]

git-author:

Rafaël Carré <funman@videolan.org> 1210366745 +0200

Message:

Fix memory leaks in ncurses intf

Files:

• modules/gui/ncurses.c (modified) (8 diffs)

modules/gui/ncurses.c

@@ -316 +316 @@
-    {
-        p_sys->psz_current_dir = strdup( val.psz_string );
-        free( val.psz_string );
-    }
-    else
@@ -322 +321 @@
-        p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir );
-    }
+
+    free( val.psz_string );
-
-    p_sys->i_dir_entries = 0;
@@ -338 +339 @@
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
-    intf_sys_t    *p_sys = p_intf->p_sys;
-    int i;
-
-    PlaylistDestroy( p_intf );
-
-for( i = 0; i < p_sys->i_dir_entries; i++
-
-i
+while( p_sys->i_dir_entries
+
+0
-        free( p_dir_entry->psz_path );
-i
+0
-        free( p_dir_entry );
-    }
@@ -1337 +1337 @@
-    int      i_len;
-
+    if( w <= 0 )
+        return;
+
-    va_start( vl_args, p_fmt );
-    if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 )
-        return;
-    va_end( vl_args );
-
-    if( ( p_buf == NULL ) || ( w <= 0 ) )
-        return;
-
-    i_len = strlen( p_buf );
@@ -1356 +1356 @@
-
-    if( i_char_len == (size_t)-1 )
-
+
+
+
-        return;
+    }
-    else
-    {
@@ -1424 +1427 @@
-        mvhline( y, x + i_width, ' ', w - i_width );
-    }
+
+    free( p_buf );
-#else
-    if( i_len > w )
@@ -2130 +2135 @@
-
-        DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color );
+        free( psz_title );
-
-        if( p_sys->b_need_update || p_sys->pp_plist == NULL )
@@ -2384 +2390 @@
-{
-    intf_sys_t *p_sys = p_intf->p_sys;
-
-
-
-
-
+
+
+
+
-        free( p_pl_item->psz_display );
-i
+0
-        free( p_pl_item );
-    }
-    p_sys->pp_plist = NULL;
-    p_sys->i_plist_entries = 0;
-}
-