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
34ab57aa
Commit
34ab57aa
authored
Mar 17, 2008
by
Filippo Carone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check if media_list_player->media_list is null before locking - fixes #1524
parent
489d57c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
.../java/org/videolan/jvlc/internal/MediaListPlayerTest.java
+2
-4
src/control/media_list_player.c
src/control/media_list_player.c
+7
-0
No files found.
bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
View file @
34ab57aa
...
...
@@ -101,15 +101,13 @@ public class MediaListPlayerTest
Assert
.
assertEquals
(
0
,
exception
.
raised
);
}
// @Test
/**
* This test is disabled: see https://trac.videolan.org/vlc/ticket/1524
*/
@Test
public
void
mediaListPlayerPlayNoItemTest
()
{
libvlc_exception_t
exception
=
new
libvlc_exception_t
();
LibVlcMediaListPlayer
mediaListPlayer
=
libvlc
.
libvlc_media_list_player_new
(
libvlcInstance
,
exception
);
libvlc
.
libvlc_media_list_player_play
(
mediaListPlayer
,
exception
);
Assert
.
assertEquals
(
1
,
exception
.
raised
);
}
}
src/control/media_list_player.c
View file @
34ab57aa
...
...
@@ -40,6 +40,7 @@ get_next_path( libvlc_media_list_player_t * p_mlp )
libvlc_media_list_path_t
ret
;
libvlc_media_list_t
*
p_parent_of_playing_item
;
libvlc_media_list_t
*
p_sublist_of_playing_item
;
p_sublist_of_playing_item
=
libvlc_media_list_sublist_at_path
(
p_mlp
->
p_mlist
,
p_mlp
->
current_playing_item_path
);
...
...
@@ -427,6 +428,12 @@ void libvlc_media_list_player_next( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t
*
p_e
)
{
libvlc_media_list_path_t
path
;
if
(
!
p_mlp
->
p_mlist
)
{
libvlc_exception_raise
(
p_e
,
"No more element to play"
);
return
;
}
libvlc_media_list_lock
(
p_mlp
->
p_mlist
);
...
...
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