[libdvdnav-devel] [Git][videolan/libdvdread][master] dvd_reader: Fix DVDDiscID return value

[Jean-Baptiste Kempf (@jbk)]

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


Commits:
5a93cda2 by Petri Hintukainen at 2026-08-11T22:26:40+02:00
dvd_reader: Fix DVDDiscID return value

Return -1 on invalid arguments and on failure.
Invalid arguments returned 0 (success), leaving the caller with an
untouched discid.

Also write md5 digest only on success.

- - - - -


1 changed file:

- src/dvd_reader.c


Changes:

=====================================
src/dvd_reader.c
=====================================
@@ -2017,7 +2017,7 @@ int DVDDiscID( dvd_reader_t *dvd, unsigned char *discid )
 
   /* Check arguments. */
   if( dvd == NULL || discid == NULL )
-    return 0;
+    return -1;
 
   vmg_ifo = ifoOpen( dvd, 0 );
   if( !vmg_ifo ) {
@@ -2066,10 +2066,11 @@ int DVDDiscID( dvd_reader_t *dvd, unsigned char *discid )
     }
   }
   EndMD5( &ctx );
-  memcpy( discid, ctx.buf, 16 );
   if(!nr_of_files)
     return -1;
 
+  memcpy( discid, ctx.buf, 16 );
+
   return 0;
 }
 



View it on GitLab: https://code.videolan.org/videolan/libdvdread/-/commit/5a93cda243f0d658003bfaf057b0431130615848

-- 
View it on GitLab: https://code.videolan.org/videolan/libdvdread/-/commit/5a93cda243f0d658003bfaf057b0431130615848
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