[libdvdcss-devel] libdvdcss: Ensure that the pointer passed to strlen() is not NULL

Diego Biurrun git at videolan.org
Tue Nov 11 14:47:12 CET 2014


libdvdcss | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Nov  6 15:19:13 2014 +0100| [e8c0c4475b35c5a6c95794e51fd4c242f7af3d3d] | committer: Diego Biurrun

libdvdcss: Ensure that the pointer passed to strlen() is not NULL

This fixes CID 75513.

> http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=e8c0c4475b35c5a6c95794e51fd4c242f7af3d3d
---

 src/libdvdcss.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index 4c19c6d..027a32e 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -262,7 +262,7 @@ static char *set_cache_directory( dvdcss_t dvdcss )
 
     /* Check that there is enough space for the cache directory path and the
      * block filename. The +1 are path separators and terminating null byte. */
-    if( strlen( psz_cache ) + 1 + DISC_TITLE_LENGTH + 1 +
+    if( psz_cache && strlen( psz_cache ) + 1 + DISC_TITLE_LENGTH + 1 +
         MANUFACTURING_DATE_LENGTH + 1 + STRING_KEY_SIZE + 1 +
         CACHE_FILENAME_LENGTH + 1 > PATH_MAX )
     {



More information about the libdvdcss-devel mailing list