shithub: libdvdcss

Info  •  Files  •  Log  •  Branches

dvdcss_open_stream: fix SEGFAULT due to a NULL psz_target

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

--- a/src/device.c

+++ b/src/device.c

@@ -190,7 +190,7 @@

 #endif

     /* If the device name is non-NULL or stream is set, return. */

-    if( dvdcss->psz_device[0] || dvdcss->p_stream )

+    if( (dvdcss->psz_device && dvdcss->psz_device[0]) || dvdcss->p_stream )

     {

         return;

     }

--- a/src/libdvdcss.c

+++ b/src/libdvdcss.c

@@ -495,7 +495,7 @@

     /* Initialize structure with default values. */

     dvdcss->i_pos = 0;

     dvdcss->p_titles = NULL;

-    dvdcss->psz_device = strdup( psz_target );

+    dvdcss->psz_device = psz_target ? strdup( psz_target ) : NULL;

     dvdcss->psz_error = "no error";

     dvdcss->i_method = DVDCSS_METHOD_KEY;

     dvdcss->psz_cachefile[0] = '\0';