August 2014 - DVDnav-discuss - lists.mplayerhq.hu

[PATCH] configure: add -no-undefined to LDFLAGS on OS/2
by KO Myung-Hun 20 Sep '14

20 Sep '14

--- configure.ac | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index f83aedb..b41062f 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,9 @@ AC_C_BIGENDIAN AS_CASE([$host], [*mingw32* | *cygwin*], [AC_CHECK_FUNCS(gettimeofday)]) +AS_CASE([$host], + [*os2*], [LDFLAGS="$LDFLAGS -no-undefined"]) + dnl --------------------------------------------- dnl threads dnl --------------------------------------------- -- 1.7.3.2

5 11

Return an error in dvdnav_get_position instead of asserting
by git＠videolan.org 31 Aug '14

31 Aug '14

libdvdnav | branch: master | Jean-Baptiste Kempf <jb(a)videolan.org> | Sun Aug 31 00:51:40 2014 +0200| [2d73a2b3c6ccd3d45be194d482cfb09f8e5055e2] | committer: Jean-Baptiste Kempf Return an error in dvdnav_get_position instead of asserting LP: #1236939 > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=2d73a2b3c6ccd3… --- src/searching.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/searching.c b/src/searching.c index f6e497e..74a16ee 100644 --- a/src/searching.c +++ b/src/searching.c @@ -563,7 +563,8 @@ dvdnav_status_t dvdnav_get_position(dvdnav_t *this, uint32_t *pos, *len += cell->last_sector - cell->first_sector + 1; } - assert((signed)*pos != -1); + if((signed)*pos == -1) + return DVDNAV_STATUS_ERR; pthread_mutex_unlock(&this->vm_lock);

3 2

dvdnav_get_position: Fix mutex unlocking in case of error
by git＠videolan.org 31 Aug '14

31 Aug '14

libdvdnav | branch: master | Jean-Baptiste Kempf <jb(a)videolan.org> | Sun Aug 31 19:51:04 2014 +0200| [e225924870be20b03aa5e05b8bd1f524499fe722] | committer: Jean-Baptiste Kempf dvdnav_get_position: Fix mutex unlocking in case of error > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=e225924870be20… --- src/searching.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/searching.c b/src/searching.c index 74a16ee..93c7c2c 100644 --- a/src/searching.c +++ b/src/searching.c @@ -563,11 +563,11 @@ dvdnav_status_t dvdnav_get_position(dvdnav_t *this, uint32_t *pos, *len += cell->last_sector - cell->first_sector + 1; } + pthread_mutex_unlock(&this->vm_lock); + if((signed)*pos == -1) return DVDNAV_STATUS_ERR; - pthread_mutex_unlock(&this->vm_lock); - return DVDNAV_STATUS_OK; }

1 0

Do not assert on NULL pgcit
by git＠videolan.org 30 Aug '14

30 Aug '14

libdvdnav | branch: master | Jean-Baptiste Kempf <jb(a)videolan.org> | Sun Aug 31 00:40:47 2014 +0200| [b026ed3da85b2085678a8d9e643e85e072ae6f83] | committer: Jean-Baptiste Kempf Do not assert on NULL pgcit > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=b026ed3da85b20… --- src/vm/getset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vm/getset.c b/src/vm/getset.c index 12b24ec..cd0c074 100644 --- a/src/vm/getset.c +++ b/src/vm/getset.c @@ -242,7 +242,10 @@ int get_ID(vm_t *vm, int id) { /* Relies on state to get the correct pgcit. */ pgcit = get_PGCIT(vm); - assert(pgcit != NULL); + if(pgcit == NULL) { + fprintf(MSG_OUT, "libdvdnav: PGCIT null!\n"); + return 0; + } #ifdef TRACE fprintf(MSG_OUT, "libdvdnav: ** Searching for menu (0x%x) entry PGC\n", id); #endif

1 0

Do not assert on NULL pgcit
by git＠videolan.org 30 Aug '14

30 Aug '14

libdvdnav | branch: master | Jean-Baptiste Kempf <jb(a)videolan.org> | Sun Aug 31 00:40:47 2014 +0200| [697a62a737c945d15c8836b44c4972123ddc9e0c] | committer: Jean-Baptiste Kempf Do not assert on NULL pgcit > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=697a62a737c945… --- src/vm/getset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vm/getset.c b/src/vm/getset.c index 12b24ec..dda9440 100644 --- a/src/vm/getset.c +++ b/src/vm/getset.c @@ -242,7 +242,10 @@ int get_ID(vm_t *vm, int id) { /* Relies on state to get the correct pgcit. */ pgcit = get_PGCIT(vm); - assert(pgcit != NULL); + if(pgcit == NULL) { + fprintf(MSG_OUT, "libdvdnav: PGCIT null!\n", id); + return 0; + } #ifdef TRACE fprintf(MSG_OUT, "libdvdnav: ** Searching for menu (0x%x) entry PGC\n", id); #endif

1 0

Tag 5.0.1 : libdvdnav 5.0.1
by git＠videolan.org 28 Aug '14

28 Aug '14

[libdvdnav] [branch: refs/tags/5.0.1] Tag: 916101a1ec4b50d929cb1fd5729764f4b1a1657e > http://git.videolan.org/gitweb.cgi/libdvdnav.git?a=tag;h=916101a1ec4b50d929… Tagger: Jean-Baptiste Kempf <jb(a)videolan.org> Date: Thu Aug 28 08:58:34 2014 +0200 libdvdnav 5.0.1 This release is a minor release of libdvdnav, fixing important bugs present in 5.0.0. The important fixes include double-free in dvdnav_free_dup, integer overflow, data race condition and improved compatibility with some DVDs.

1 0

Update ChangeLog for 5.0.1
by git＠videolan.org 26 Aug '14

26 Aug '14

libdvdnav | branch: master | Jean-Baptiste Kempf <jb(a)videolan.org> | Tue Aug 26 17:38:39 2014 +0200| [aa3659d8d11c94ce621f830a241cd078649adb6c] | committer: Jean-Baptiste Kempf Update ChangeLog for 5.0.1 > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=aa3659d8d11c94… --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a8111f8..ff10176 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ libdvdnav (5.0.1) - + * removed assert on unknown VM commands, fixing playback of some DVDs + * fixed a double free in dvdnav_free_dup + * fixed an integer overflow, a data race condition and return inconsistency libdvdnav (5.0.0) * Android support

1 0

Re: [DVDnav-discuss] Bug report for specific DVD
by Michael Russo 26 Aug '14

26 Aug '14

(Sorry about the reply not looking like a reply, I hadn't subscribed to the mailing list but I am now) I tried to define TRACE in vm.h (uncommenting the line) but I get a message about an undefined constant FP_DOMAIN. The compilation succeeds without TRACE enabled. I also can't find where this constant is defined inside of libdvdnav. Perhaps this is a simple oversight related to all the cleanup work that took place in 5.0.0? root@ossy:/usr/src/libdvdnav-5.0.0# grep -r FP_DOMAIN . ./src/vm/play.c: if((vm->state).domain != FP_DOMAIN) { ./src/vm/play.c: if((vm->state).domain != FP_DOMAIN) { root@ossy:/usr/src/libdvdnav-5.0.0# make make all-am make[1]: Entering directory `/usr/src/libdvdnav-5.0.0' CC src/dvdnav.lo CC src/read_cache.lo CC src/navigation.lo src/navigation.c: In function 'dvdnav_part_play_auto_stop': src/navigation.c:247:66: warning: unused parameter 'parts_to_play' [-Wunused-parameter] int32_t part, int32_t parts_to_play) { ^ src/navigation.c: In function 'dvdnav_time_play': src/navigation.c:254:58: warning: unused parameter 'title' [-Wunused-parameter] dvdnav_status_t dvdnav_time_play(dvdnav_t *this, int32_t title, ^ src/navigation.c:255:43: warning: unused parameter 'time' [-Wunused-parameter] uint64_t time) { ^ CC src/highlight.lo CC src/searching.lo src/searching.c: In function 'dvdnav_scan_admap': src/searching.c:82:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] while(address < admap_entries) { ^ src/searching.c: In function 'dvdnav_tmap_get': src/searching.c:756:11: warning: variable 'vts_idx' set but not used [-Wunused-but-set-variable] int32_t vts_idx = 0; ^ src/searching.c: In function 'dvdnav_admap_search': src/searching.c:874:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] else if (cur_idx >= admap_len) cur_idx = admap_len - 1; ^ src/searching.c: In function 'dvdnav_tmap_search': src/searching.c:912:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] else if (cur_idx >= tmap_len) cur_idx = tmap_len - 1; ^ src/searching.c: In function 'dvdnav_admap_interpolate_vobu': src/searching.c:1042:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (vobu_idx >= args->admap_len) { ^ CC src/settings.lo CC src/vm/decoder.lo src/vm/decoder.c: In function 'vmEval_CMD': src/vm/decoder.c:597:3: warning: implicit declaration of function 'vm_print_registers' [-Wimplicit-function-declaration] vm_print_registers( registers ); ^ src/vm/decoder.c: At top level: src/vm/decoder.c:764:6: warning: conflicting types for 'vm_print_registers' [enabled by default] void vm_print_registers( registers_t *registers ) { ^ src/vm/decoder.c:597:3: note: previous implicit declaration of 'vm_print_registers' was here vm_print_registers( registers ); ^ CC src/vm/vm.lo src/vm/vm.c: In function 'vm_position_print': src/vm/vm.c:78:30: warning: unused parameter 'vm' [-Wunused-parameter] void vm_position_print(vm_t *vm, vm_position_t *position) { ^ src/vm/vm.c: In function 'process_command': src/vm/vm.c:682:5: warning: implicit declaration of function 'vm_print_link' [-Wimplicit-function-declaration] vm_print_link(link_values); ^ src/vm/vm.c: At top level: src/vm/vm.c:140:12: warning: 'dvd_read_name' defined but not used [-Wunused-function] static int dvd_read_name(char *name, char *serial, const char *device) { ^ CC src/vm/play.lo src/vm/play.c: In function 'play_PGC': src/vm/play.c:51:28: error: 'FP_DOMAIN' undeclared (first use in this function) if((vm->state).domain != FP_DOMAIN) { ^ src/vm/play.c:51:28: note: each undeclared identifier is reported only once for each function it appears in src/vm/play.c: In function 'play_PGC_PG': src/vm/play.c:91:28: error: 'FP_DOMAIN' undeclared (first use in this function) if((vm->state).domain != FP_DOMAIN) { ^ make[1]: *** [src/vm/play.lo] Error 1 make[1]: Leaving directory `/usr/src/libdvdnav-5.0.0' make: *** [all] Error 2 On 13 Aug, Michael Russo wrote : >* Program received signal SIGSEGV, Segmentation fault. *>* [Switching to Thread 0x7fffeb9f5700 (LWP 1155)] *>* vmEval_CMD (commands=0x7fffd8001200, num_commands=4, *>* registers=registers at entry <https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss>=0x7fffd8056568, *>* return_values=return_values at entry <https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss>=0x7fffeb8f6070) at *>* src/vm/decoder.c:590 *>* 590 registers_t *registers, link_t *return_values) { *>* (gdb) bt *>* #0 vmEval_CMD (commands=0x7fffd8001200, num_commands=4, *>* registers=registers at entry <https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss>=0x7fffd8056568, *>* return_values=return_values at entry <https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss>=0x7fffeb8f6070) at * SO it crashes on the function call? Can you define TRACE so we have more logs,please? With my kindest regards, -- Jean-Baptiste Kempfhttp://www.jbkempf.com/ - +33 672 704 734 Sent from my Electronic Device

5 13

dvdnav: fix invalid free in dvdnav_free_dup
by git＠videolan.org 25 Aug '14

25 Aug '14

libdvdnav | branch: master | John Stebbins <jstebbins(a)jetheaddev.com> | Fri Aug 22 12:06:41 2014 -0700| [93f9aa5947321f90d19f74a60eeaceff8fd09f71] | committer: John Stebbins dvdnav: fix invalid free in dvdnav_free_dup When path was changed from char[] to char*, a free was added to dvdnav_free_dup, but the string was not copied in dvdnav_dup resulting in a double free. > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=93f9aa5947321f… --- src/dvdnav.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/dvdnav.c b/src/dvdnav.c index 6f32550..a5fac25 100644 --- a/src/dvdnav.c +++ b/src/dvdnav.c @@ -74,27 +74,40 @@ dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) { (*dest) = NULL; this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); - if(!this) + if (!this) return DVDNAV_STATUS_ERR; memcpy(this, src, sizeof(dvdnav_t)); this->file = NULL; + this->vm = NULL; + this->path = NULL; + this->cache = NULL; pthread_mutex_init(&this->vm_lock, NULL); this->vm = vm_new_copy(src->vm); - if(!this->vm) { - printerr("Error initialising the DVD VM."); - pthread_mutex_destroy(&this->vm_lock); - free(this); - return DVDNAV_STATUS_ERR; - } + if (!this->vm) + goto fail; + + this->path = strdup(src->path); + if (!this->path) + goto fail; /* Start the read-ahead cache. */ this->cache = dvdnav_read_cache_new(this); + if (!this->cache) + goto fail; (*dest) = this; return DVDNAV_STATUS_OK; + +fail: + printerr("Error initialising the DVD VM."); + pthread_mutex_destroy(&this->vm_lock); + vm_free_vm(this->vm); + free(this->path); + free(this); + return DVDNAV_STATUS_ERR; } dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) {

1 0

[PATCH] Fix for Unknown command type handling
by Marcel Mol 17 Aug '14

17 Aug '14

Some DVDs seem to use command type 7 for something. But it will hit the 'Unknown command' check, resulting in asser(0). I.e. DVD refuses to play. By removing the assert() call the DVD seems to play fine. This patch removes the assert and corrects the error message (it is a 'command type', not a 'command') Signed-off-by: Marcel Mol <marcel(a)mesa.nl> --- src/vm/decoder.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vm/decoder.c b/src/vm/decoder.c index 1e16a9c..bb95562 100644 --- a/src/vm/decoder.c +++ b/src/vm/decoder.c @@ -570,9 +570,8 @@ static int32_t eval_command(uint8_t *bytes, registers_t* registers, link_t *retu if(res) res = -1; break; - default: /* Unknown command */ - fprintf(MSG_OUT, "libdvdnav: WARNING: Unknown Command=%x\n", vm_getbits(&command, 63, 3)); - assert(0); + default: /* Unknown command type */ + fprintf(MSG_OUT, "libdvdnav: WARNING: Unknown Command Type=%x\n", vm_getbits(&command, 63, 3)); } /* Check if there are bits not yet examined */ -- 1.9.3

3 2