From 10b3d6f1a239ec17c16cdfca13b4f98051591f34 Mon Sep 17 00:00:00 2001 From: Filippo Carone Date: Sun, 16 Mar 2008 19:59:47 +0100 Subject: [PATCH] fix for libvlc_get_input_thread: check for null before locking. fixes #1522 --- .../java/org/videolan/jvlc/internal/MediaListPlayerTest.java | 5 +---- src/control/media_instance.c | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java index a60efbe075..52349f7986 100644 --- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java +++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java @@ -92,10 +92,7 @@ public class MediaListPlayerTest Assert.assertEquals(0, exception.raised); } -// @Test - /** - * see Ticket #1522 on trac ( http://trac.videolan.org/vlc/ticket/1522 ) - */ + @Test public void mediaListPlayerIsPlayingTest() { libvlc_exception_t exception = new libvlc_exception_t(); diff --git a/src/control/media_instance.c b/src/control/media_instance.c index 4b8471b369..e7dc33d3aa 100644 --- a/src/control/media_instance.c +++ b/src/control/media_instance.c @@ -124,6 +124,11 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi, { input_thread_t *p_input_thread; + if ( !p_mi ) + { + RAISENULL( "Input is NULL" ); + } + vlc_mutex_lock( &p_mi->object_lock ); if( !p_mi || p_mi->i_input_id == -1 ) -- 2.39.2