Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
10b3d6f1
Commit
10b3d6f1
authored
Mar 16, 2008
by
Filippo Carone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for libvlc_get_input_thread: check for null before locking. fixes #1522
parent
c6fabd0f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
.../java/org/videolan/jvlc/internal/MediaListPlayerTest.java
+1
-4
src/control/media_instance.c
src/control/media_instance.c
+5
-0
No files found.
bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
View file @
10b3d6f1
...
@@ -92,10 +92,7 @@ public class MediaListPlayerTest
...
@@ -92,10 +92,7 @@ public class MediaListPlayerTest
Assert
.
assertEquals
(
0
,
exception
.
raised
);
Assert
.
assertEquals
(
0
,
exception
.
raised
);
}
}
// @Test
@Test
/**
* see Ticket #1522 on trac ( http://trac.videolan.org/vlc/ticket/1522 )
*/
public
void
mediaListPlayerIsPlayingTest
()
public
void
mediaListPlayerIsPlayingTest
()
{
{
libvlc_exception_t
exception
=
new
libvlc_exception_t
();
libvlc_exception_t
exception
=
new
libvlc_exception_t
();
...
...
src/control/media_instance.c
View file @
10b3d6f1
...
@@ -124,6 +124,11 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi,
...
@@ -124,6 +124,11 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi,
{
{
input_thread_t
*
p_input_thread
;
input_thread_t
*
p_input_thread
;
if
(
!
p_mi
)
{
RAISENULL
(
"Input is NULL"
);
}
vlc_mutex_lock
(
&
p_mi
->
object_lock
);
vlc_mutex_lock
(
&
p_mi
->
object_lock
);
if
(
!
p_mi
||
p_mi
->
i_input_id
==
-
1
)
if
(
!
p_mi
||
p_mi
->
i_input_id
==
-
1
)
...
...
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