git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d550023
)
Fix a memory leak when media library is disabled
author
Rafaël Carré
<rafael.carre@gmail.com>
Mon, 30 Mar 2009 17:35:39 +0000
(19:35 +0200)
committer
Rafaël Carré
<rafael.carre@gmail.com>
Wed, 1 Apr 2009 13:10:19 +0000
(15:10 +0200)
src/playlist/loadsave.c
patch
|
blob
|
history
diff --git
a/src/playlist/loadsave.c
b/src/playlist/loadsave.c
index
5be9767
..
e7bbec2
100644
(file)
--- a/
src/playlist/loadsave.c
+++ b/
src/playlist/loadsave.c
@@
-114,11
+114,15
@@
static void input_item_subitem_added( const vlc_event_t * p_event,
int playlist_MLLoad( playlist_t *p_playlist )
{
int playlist_MLLoad( playlist_t *p_playlist )
{
- char *psz_datadir
= config_GetUserDataDir()
;
+ char *psz_datadir;
char *psz_uri = NULL;
input_item_t *p_input;
char *psz_uri = NULL;
input_item_t *p_input;
- if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
+ if( !config_GetInt( p_playlist, "media-library") )
+ return VLC_SUCCESS;
+
+ psz_datadir = config_GetUserDataDir();
+
if( !psz_datadir ) /* XXX: This should never happen */
{
msg_Err( p_playlist, "no data directory, cannot load media library") ;
if( !psz_datadir ) /* XXX: This should never happen */
{
msg_Err( p_playlist, "no data directory, cannot load media library") ;
@@
-195,8
+199,13
@@
error:
int playlist_MLDump( playlist_t *p_playlist )
{
int playlist_MLDump( playlist_t *p_playlist )
{
- char *psz_datadir = config_GetUserDataDir();
- if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
+ char *psz_datadir;
+
+ if( !config_GetInt( p_playlist, "media-library") )
+ return VLC_SUCCESS;
+
+ psz_datadir = config_GetUserDataDir();
+
if( !psz_datadir ) /* XXX: This should never happen */
{
msg_Err( p_playlist, "no data directory, cannot save media library") ;
if( !psz_datadir ) /* XXX: This should never happen */
{
msg_Err( p_playlist, "no data directory, cannot save media library") ;