- DVDnav-discuss - lists.mplayerhq.hu

r1011 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:27:37 2008 New Revision: 1011 Log: in DVDDiscID() call DVDCloseFile() before exiting with an error ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Sat Apr 19 12:27:37 2008 @@ -1117,6 +1117,7 @@ int DVDDiscID( dvd_reader_t *dvd, unsign char *buffer = (unsigned char *)(((uintptr_t)buffer_base & ~((uintptr_t)2047)) + 2048); if( buffer_base == NULL ) { + DVDCloseFile( dvd_file ); fprintf( stderr, "libdvdread: DVDDiscId, failed to " "allocate memory for file read!\n" ); return -1;

1 0

r1010 - trunk/libdvdnav/src/dvdnav.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:11:36 2008 New Revision: 1010 Log: in dvdnav_get_next_cache_block() release the mutex if vm_start() failed ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdnav.c Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sat Apr 19 12:11:36 2008 @@ -416,6 +416,7 @@ dvdnav_status_t dvdnav_get_next_cache_bl /* Start the VM */ if (!vm_start(this->vm)) { printerr("Encrypted or faulty DVD"); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_ERR; } this->started = 1;

1 0

r1009 - trunk/libdvdnav/src/dvdnav.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:07:47 2008 New Revision: 1009 Log: added missing mutex around the code in dvdnav_clear() ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdnav.c Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sat Apr 19 12:07:47 2008 @@ -53,6 +53,7 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) { /* clear everything except file, vm, mutex, readahead */ + pthread_mutex_lock(&this->vm_lock); if (this->file) DVDCloseFile(this->file); this->file = NULL; @@ -70,6 +71,7 @@ static dvdnav_status_t dvdnav_clear(dvdn this->cur_cell_time = 0; dvdnav_read_cache_clear(this->cache); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_OK; }

1 0

r1008 - trunk/libdvdnav/src/dvdnav.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:44:15 2008 New Revision: 1008 Log: in dvdnav_open() make sure to NULL-terminate this->path and to not overrun its length; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdnav.c Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sat Apr 19 11:44:15 2008 @@ -108,7 +108,8 @@ dvdnav_status_t dvdnav_open(dvdnav_t** d } /* Set the path. FIXME: Is a deep copy 'right' */ - strncpy(this->path, path, MAX_PATH_LEN); + strncpy(this->path, path, MAX_PATH_LEN - 1); + this->path[MAX_PATH_LEN - 1] = '\0'; /* Pre-open and close a file so that the CSS-keys are cached. */ this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);

1 0

r1007 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:40:03 2008 New Revision: 1007 Log: prevent access to index ouf of bounds when iterating over titles; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Sat Apr 19 11:40:03 2008 @@ -971,7 +971,8 @@ static int DVDReadBlocksPath( dvd_file_t * also error from this read will not show in ret. */ /* Does the next part exist? If not then return now. */ - if( !dvd_file->title_devs[ i + 1 ] ) return ret; + if( i + 1 >= TITLES_MAX || !dvd_file->title_devs[ i + 1 ] ) + return ret; /* Read part 2 */ off = dvdinput_seek( dvd_file->title_devs[ i + 1 ], 0 );

1 0

r1006 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:34:55 2008 New Revision: 1006 Log: #define TITLES_MAX as 9 instead of using an hardcodec value ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Sat Apr 19 11:34:55 2008 @@ -88,6 +88,8 @@ struct dvd_reader_s { void *udfcache; }; +#define TITLES_MAX 9 + struct dvd_file_s { /* Basic information. */ dvd_reader_t *dvd; @@ -100,8 +102,8 @@ struct dvd_file_s { uint32_t seek_pos; /* Information required for a directory path drive. */ - size_t title_sizes[ 9 ]; - dvd_input_t title_devs[ 9 ]; + size_t title_sizes[ TITLES_MAX ]; + dvd_input_t title_devs[ TITLES_MAX ]; /* Calculated at open-time, size in blocks. */ ssize_t filesize; @@ -441,10 +443,10 @@ dvd_reader_t *DVDOpen( const char *ppath path_copy[ strlen( path_copy ) - 1 ] = '\0'; } - if( strlen( path_copy ) > 9 ) { - if( !strcasecmp( &(path_copy[ strlen( path_copy ) - 9 ]), + if( strlen( path_copy ) > TITLES_MAX ) { + if( !strcasecmp( &(path_copy[ strlen( path_copy ) - TITLES_MAX ]), "/video_ts" ) ) { - path_copy[ strlen( path_copy ) - 9 ] = '\0'; + path_copy[ strlen( path_copy ) - TITLES_MAX ] = '\0'; } } @@ -788,7 +790,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r dvd_file->filesize = dvd_file->title_sizes[ 0 ]; } else { - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 ); if( !findDVDFile( dvd, filename, full_path ) ) { @@ -873,7 +875,7 @@ void DVDCloseFile( dvd_file_t *dvd_file if( dvd_file->dvd->isImageFile ) { ; } else { - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { if( dvd_file->title_devs[ i ] ) { dvdinput_close( dvd_file->title_devs[i] ); } @@ -936,7 +938,7 @@ static int DVDReadBlocksPath( dvd_file_t ret = 0; ret2 = 0; - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { if( !dvd_file->title_sizes[ i ] ) return 0; /* Past end of file */ if( offset < dvd_file->title_sizes[ i ] ) {

1 0

r1005 - trunk/libdvdnav/src/dvdread/dvd_udf.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:29:18 2008 New Revision: 1005 Log: prevent string overflow in static buffer using strncat(MAX_UDF_FILE_NAME_LEN-1) instead of strcat() ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_udf.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_udf.c Sat Apr 19 11:29:18 2008 @@ -802,7 +802,7 @@ uint32_t UDFFindFile( dvd_reader_t *devi *filesize = 0; tokenline[0] = '\0'; - strcat( tokenline, filename ); + strncat(tokenline, filename, MAX_UDF_FILE_NAME_LEN - 1); if(!(GetUDFCache(device, PartitionCache, 0, &partition) &&

1 0

r1004 - trunk/libdvdnav/src/dvdread/dvd_udf.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:19:24 2008 New Revision: 1004 Log: set cached_dir_base=NULL after free()ing it; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_udf.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_udf.c Sat Apr 19 11:19:24 2008 @@ -562,6 +562,7 @@ static int UDFScanDir( dvd_reader_t *dev cached_dir = (uint8_t *)(((uintptr_t)cached_dir_base & ~((uintptr_t)2047)) + 2048); if( DVDReadLBUDF( device, lbnum, dir_lba, cached_dir, 0) <= 0 ) { free(cached_dir_base); + cached_dir_base = NULL; cached_dir = NULL; } /*

1 0

r1003 - trunk/libdvdnav/examples/menus.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:15:57 2008 New Revision: 1003 Log: removed unused variable dsi; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/examples/menus.c Modified: trunk/libdvdnav/examples/menus.c ============================================================================== --- trunk/libdvdnav/examples/menus.c (original) +++ trunk/libdvdnav/examples/menus.c Sat Apr 19 11:15:57 2008 @@ -215,7 +215,6 @@ int main(int argc, char **argv) { * engine of the player so that it knows the dimensions of the button areas. */ { pci_t *pci; - dsi_t *dsi; /* Applications with fifos should not use these functions to retrieve NAV packets, * they should implement their own NAV handling, because the packet you get from these @@ -223,7 +222,7 @@ int main(int argc, char **argv) { * Applications with fifos should therefore pass the NAV packet through the fifo * and decoding pipeline just like any other data. */ pci = dvdnav_get_current_nav_pci(dvdnav); - dsi = dvdnav_get_current_nav_dsi(dvdnav); + dvdnav_get_current_nav_dsi(dvdnav); if(pci->hli.hl_gi.btn_ns > 0) { int button;

1 0

r1002 - in trunk/libdvdnav/src: navigation.c read_cache.c remap.c searching.c settings.c vm/vm.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:11:14 2008 New Revision: 1002 Log: removed unnecessary inclusion of vmcmd.h; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/navigation.c trunk/libdvdnav/src/read_cache.c trunk/libdvdnav/src/remap.c trunk/libdvdnav/src/searching.c trunk/libdvdnav/src/settings.c trunk/libdvdnav/src/vm/vm.c Modified: trunk/libdvdnav/src/navigation.c ============================================================================== --- trunk/libdvdnav/src/navigation.c (original) +++ trunk/libdvdnav/src/navigation.c Sat Apr 19 11:11:14 2008 @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/read_cache.c ============================================================================== --- trunk/libdvdnav/src/read_cache.c (original) +++ trunk/libdvdnav/src/read_cache.c Sat Apr 19 11:11:14 2008 @@ -42,7 +42,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" #include "read_cache.h" Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c (original) +++ trunk/libdvdnav/src/remap.c Sat Apr 19 11:11:14 2008 @@ -45,7 +45,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Sat Apr 19 11:11:14 2008 @@ -38,7 +38,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/settings.c ============================================================================== --- trunk/libdvdnav/src/settings.c (original) +++ trunk/libdvdnav/src/settings.c Sat Apr 19 11:11:14 2008 @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c (original) +++ trunk/libdvdnav/src/vm/vm.c Sat Apr 19 11:11:14 2008 @@ -48,7 +48,6 @@ #include "decoder.h" #include "remap.h" #include "vm.h" -#include "vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h"

1 0