[libdvdcss-devel] [Git][videolan/libdvdcss][master] CPXM: read discs that have no decryption set up

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / libdvdcss


Commits:
811ce97a by Saifelden Mohamed Ismail at 2026-07-28T13:46:11+02:00
CPXM: read discs that have no decryption set up

- - - - -


1 changed file:

- src/libdvdcpxm.c


Changes:

=====================================
src/libdvdcpxm.c
=====================================
@@ -910,14 +910,12 @@ int dvdcpxm_read ( dvdcss_t dvdcss, void *p_buffer,
     i_ret = dvdcss->pf_read( dvdcss, _p_buffer, i_blocks );
 
     if( i_ret <= 0
+         || !dvdcss->cpxm
          || !(i_flags & DVDCSS_READ_DECRYPT) )
     {
         return i_ret;
     }
 
-    if ( !dvdcss->cpxm )
-        return -1;
-
     /* Decrypt the blocks we managed to read */
     for( i_index = i_ret; i_index; i_index-- )
     {
@@ -946,14 +944,12 @@ int dvdcpxm_readv ( dvdcss_t dvdcss, void *p_iovec,
     i_ret = dvdcss->pf_readv( dvdcss, _p_iovec, i_blocks );
 
     if( i_ret <= 0
+         || !dvdcss->cpxm
          || !(i_flags & DVDCSS_READ_DECRYPT) )
     {
         return i_ret;
     }
 
-    if ( !dvdcss->cpxm )
-        return -1;
-
     /* Initialize loop for decryption */
     iov_base = _p_iovec->iov_base;
     iov_len = _p_iovec->iov_len;



View it on GitLab: https://code.videolan.org/videolan/libdvdcss/-/commit/811ce97a1d4d1c9d936f4b2707f533a9ef768251

-- 
View it on GitLab: https://code.videolan.org/videolan/libdvdcss/-/commit/811ce97a1d4d1c9d936f4b2707f533a9ef768251
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help