Use var_CreateGetNonEmptyString for decklink-mode.

[vlc] / modules / access / decklink.cpp

diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index e99bc20cf0550105899df6b7c919440173123dea..fe7e580ef121c33847a8415e06384d4c8756d0cc 100644 (file)
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -299,6 +299,12 @@ static int Open( vlc_object_t *p_this )
     HRESULT result;
 
     i_card_index = var_InheritInteger( p_demux, "decklink-card-index" );
+    if( i_card_index < 0 )
+    {
+        msg_Err( p_demux, "Invalid card index %d", i_card_index );
+        goto finish;
+    }
+
     for( int i = 0; i <= i_card_index; ++i )
     {
         if( p_sys->p_card )
@@ -406,8 +412,8 @@ static int Open( vlc_object_t *p_this )
         goto finish;
     }
 
-    psz_display_mode = var_InheritString( p_demux, "decklink-mode" );
-    if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) {
+    psz_display_mode = var_CreateGetNonEmptyString( p_demux, "decklink-mode" );
+    if( !psz_display_mode || strlen( psz_display_mode ) > 4 ) {
         msg_Err( p_demux, "Missing or invalid --decklink-mode string" );
         goto finish;
     }