fix for #1533: check on array boundaries before removing media

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java
index b5cb23684f9b9a8143592fba5c0539a31142a4a5..35cd1a9776ceb707458c5311b511a104ac88c54a 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java
@@ -99,7 +99,14 @@ public class MediaListTest
         mlist.addMediaDescriptor(new MediaDescriptor(jvlc, mrl));
         mlist.removeMedia(new MediaDescriptor(jvlc, mrl));
         Assert.assertEquals(0, mlist.itemsCount());
-        
+    }
+    
+    @Test
+    public void mediaListRemoveNonExistingMedia()
+    {
+        MediaList mlist = new MediaList(jvlc);
+        boolean result = mlist.removeMedia(3);
+        Assert.assertFalse(result);
     }
     
     

diff --git a/src/control/media_list.c b/src/control/media_list.c
index a88ed8c4794605d5f70ffb96552c24d08dd51249..4286fb942288cc536fe43eb146042fc4b742bc1e 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -397,10 +397,15 @@ void _libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist,
                                      int index,
                                      libvlc_exception_t * p_e )
 {
-    VLC_UNUSED(p_e);
 
     libvlc_media_descriptor_t * p_md;
 
+    if( index < 0 || index > vlc_array_count( &p_mlist->items ))
+    {
+        libvlc_exception_raise( p_e, "Index out of bounds exception");
+        return;
+    }
+            
     p_md = vlc_array_item_at_index( &p_mlist->items, index );
 
     notify_item_deletion( p_mlist, p_md, index, EventWillHappen );