user data pointer added to callback structure

[vlc] / src / control / playlist.c

diff --git a/src/control/playlist.c b/src/control/playlist.c
index 9a17a838fc1084772865ff49af6325b438d7f953..2e7e3dfe243f6d7aaf61665a481edb7996c162c8 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -159,7 +159,7 @@ int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
     assert( PL );
     if( playlist_was_locked( p_instance ) )
     {
-        libvlc_exeption_raise( p_e, "You must unlock playlist before "
+        libvlc_exception_raise( p_e, "You must unlock playlist before "
                                "calling libvlc_playlist_add" );
         return VLC_EGENERIC;
     }
@@ -227,7 +227,12 @@ libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance,
         return NULL;
     }
     p_input = (libvlc_input_t *)malloc( sizeof( libvlc_input_t ) );
-
+    if( !p_input )
+    {
+        libvlc_exception_raise( p_e, "out of memory" );
+        vlc_mutex_unlock( &PL->object_lock );
+        return NULL;
+    }
     p_input->i_input_id = PL->p_input->i_object_id;
     p_input->p_instance = p_instance;
     vlc_mutex_unlock( &PL->object_lock );