* modules/access/dshow/dshow.cpp: fixed crash when no dshow devices found.

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 24b599e24f4d730575b74caff5953b0bbeb69365..f506b4a97d43c0d50cdbbb0d5acbc76d2bd04dbf 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -2,7 +2,7 @@
  * dshow.c : DirectShow access module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: dshow.cpp,v 1.5 2003/08/27 07:31:26 gbazin Exp $
+ * $Id: dshow.cpp,v 1.6 2003/08/27 12:59:11 gbazin Exp $
  *
  * Author: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -305,13 +305,14 @@ static int AccessOpen( vlc_object_t *p_this )
     if( !p_sys->i_streams )
     {
         /* Release directshow objects */
-        p_sys->p_control->Release();
+        if( p_sys->p_control ) p_sys->p_control->Release();
         p_sys->p_graph->Release();
 
         /* Uninitialize OLE/COM */
         CoUninitialize();   
 
         free( p_sys->p_header );
+        free( p_sys->pp_streams );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -388,9 +389,12 @@ static int OpenDevice( input_thread_t *p_input, string devicename,
     access_sys_t *p_sys = p_input->p_access_data;
     list<string> list_devices;
 
-    /* Enumerate audio devices and display their names */
+    /* Enumerate devices and display their names */
     FindCaptureDevice( (vlc_object_t *)p_input, NULL, &list_devices, b_audio );
 
+    if( !list_devices.size() )
+        return VLC_EGENERIC;
+
     list<string>::iterator iter;
     for( iter = list_devices.begin(); iter != list_devices.end(); iter++ )
         msg_Dbg( p_input, "found device: %s", iter->c_str() );