Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
7d84269b
Commit
7d84269b
authored
Aug 07, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist tree: fix potential memleak
also remove one level of indentation
parent
44a22697
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
40 deletions
+35
-40
src/playlist/tree.c
src/playlist/tree.c
+35
-40
No files found.
src/playlist/tree.c
View file @
7d84269b
...
...
@@ -141,60 +141,55 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
bool
b_delete_items
,
bool
b_force
)
{
PL_ASSERT_LOCKED
;
int
i
;
/* Delete the children */
for
(
i
=
p_root
->
i_children
-
1
;
i
>=
0
;
i
--
)
{
if
(
b_delete_items
||
p_root
->
pp_children
[
i
]
->
i_children
>
-
1
)
{
for
(
int
i
=
p_root
->
i_children
-
1
;
i
>=
0
;
i
--
)
if
(
b_delete_items
||
p_root
->
pp_children
[
i
]
->
i_children
>=
0
)
playlist_NodeDelete
(
p_playlist
,
p_root
->
pp_children
[
i
],
b_delete_items
,
b_force
);
}
}
/* Delete the node */
if
(
p_root
->
i_flags
&
PLAYLIST_RO_FLAG
&&
!
b_force
)
{
return
VLC_SUCCESS
;
pl_priv
(
p_playlist
)
->
b_reset_currently_playing
=
true
;
int
i
;
var_SetInteger
(
p_playlist
,
"playlist-item-deleted"
,
p_root
->
i_id
);
ARRAY_BSEARCH
(
p_playlist
->
all_items
,
->
i_id
,
int
,
p_root
->
i_id
,
i
);
if
(
i
!=
-
1
)
{
vlc_gc_decref
(
p_playlist
->
all_items
.
p_elems
[
i
]
->
p_input
);
printf
(
"deleting %d %p
\n
"
,
i
,
p_playlist
->
all_items
.
p_elems
[
i
]
->
p_input
);
ARRAY_REMOVE
(
p_playlist
->
all_items
,
i
);
}
else
{
pl_priv
(
p_playlist
)
->
b_reset_currently_playing
=
true
;
int
i
;
var_SetInteger
(
p_playlist
,
"playlist-item-deleted"
,
p_root
->
i_id
);
ARRAY_BSEARCH
(
p_playlist
->
all_items
,
->
i_id
,
int
,
p_root
->
i_id
,
i
);
if
(
p_root
->
i_children
==
-
1
)
{
ARRAY_BSEARCH
(
p_playlist
->
items
,
->
i_id
,
int
,
p_root
->
i_id
,
i
);
if
(
i
!=
-
1
)
ARRAY_REMOVE
(
p_playlist
->
all_items
,
i
);
if
(
p_root
->
i_children
==
-
1
)
{
ARRAY_BSEARCH
(
p_playlist
->
items
,
->
i_id
,
int
,
p_root
->
i_id
,
i
);
if
(
i
!=
-
1
)
ARRAY_REMOVE
(
p_playlist
->
items
,
i
);
}
ARRAY_REMOVE
(
p_playlist
->
items
,
i
);
}
/* Check if it is the current item */
if
(
get_current_status_item
(
p_playlist
)
==
p_root
)
{
/* Stop */
playlist_Control
(
p_playlist
,
PLAYLIST_STOP
,
pl_Locked
);
msg_Info
(
p_playlist
,
"stopping playback"
);
/* This item can't be the next one to be played ! */
set_current_status_item
(
p_playlist
,
NULL
);
}
/* Check if it is the current item */
if
(
get_current_status_item
(
p_playlist
)
==
p_root
)
{
/* Stop */
playlist_Control
(
p_playlist
,
PLAYLIST_STOP
,
pl_Locked
);
msg_Info
(
p_playlist
,
"stopping playback"
);
/* This item can't be the next one to be played ! */
set_current_status_item
(
p_playlist
,
NULL
);
}
ARRAY_BSEARCH
(
p_playlist
->
current
,
->
i_id
,
int
,
p_root
->
i_id
,
i
);
if
(
i
!=
-
1
)
ARRAY_REMOVE
(
p_playlist
->
current
,
i
);
ARRAY_BSEARCH
(
p_playlist
->
current
,
->
i_id
,
int
,
p_root
->
i_id
,
i
);
if
(
i
!=
-
1
)
ARRAY_REMOVE
(
p_playlist
->
current
,
i
);
PL_DEBUG
(
"deleting item `%s'"
,
p_root
->
p_input
->
psz_name
);
PL_DEBUG
(
"deleting item `%s'"
,
p_root
->
p_input
->
psz_name
);
/* Remove the item from its parent */
if
(
p_root
->
p_parent
)
playlist_NodeRemoveItem
(
p_playlist
,
p_root
,
p_root
->
p_parent
);
/* Remove the item from its parent */
if
(
p_root
->
p_parent
)
playlist_NodeRemoveItem
(
p_playlist
,
p_root
,
p_root
->
p_parent
);
playlist_ItemRelease
(
p_root
);
}
playlist_ItemRelease
(
p_root
);
return
VLC_SUCCESS
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment