Commit c365eebf authored by Daniel Baumann's avatar Daniel Baumann Committed by Reinhard Tartler

Imported Debian patch 4.2.0+20121016-1

parents 9406f421 407da148
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -601,7 +601,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
......
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -601,7 +601,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
......
# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
......@@ -1338,7 +1338,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
case `/usr/bin/file conftest.o` in
*x86-64*)
LD="${LD-ld} -m elf32_x86_64"
;;
*)
LD="${LD-ld} -m elf_i386"
;;
esac
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
......@@ -1702,7 +1709,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
if test -n "$lt_cv_sys_max_cmd_len"; then
if test -n "$lt_cv_sys_max_cmd_len" && \
test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
......@@ -2526,17 +2534,6 @@ freebsd* | dragonfly*)
esac
;;
gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
......@@ -2653,7 +2650,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
......@@ -3269,10 +3266,6 @@ freebsd* | dragonfly*)
fi
;;
gnu*)
lt_cv_deplibs_check_method=pass_all
;;
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
......@@ -3311,7 +3304,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
......@@ -4063,7 +4056,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
......@@ -4362,7 +4355,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
......@@ -6251,9 +6244,6 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
gnu*)
;;
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
......@@ -6415,7 +6405,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
......@@ -8644,7 +8634,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.5], [],
m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -8660,7 +8650,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.5])dnl
[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -71,6 +71,9 @@
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* "Define to 1 to use builtin dlfcn" */
/* #undef USING_BUILTIN_DLFCN */
/* Version number of package */
#define VERSION "4.2.0"
......
......@@ -70,6 +70,9 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* "Define to 1 to use builtin dlfcn" */
#undef USING_BUILTIN_DLFCN
/* Version number of package */
#undef VERSION
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
timestamp='2012-02-10'
timestamp='2012-04-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -225,6 +225,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
;;
-lynx*5)
os=-lynxos5
;;
-lynx*)
os=-lynxos
;;
......@@ -1537,6 +1543,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
hexagon-*)
os=-elf
;;
tic54x-*)
os=-coff
;;
......
......@@ -766,6 +766,7 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
enable_libdvdcss
enable_dlfcn
'
ac_precious_vars='build_alias
host_alias
......@@ -1402,6 +1403,7 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-libdvdcss force linking against libdvdcss
--enable-dlfcn use builtin dlfcn for mingw (default is auto)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -5453,7 +5455,8 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
if test -n "$lt_cv_sys_max_cmd_len"; then
if test -n "$lt_cv_sys_max_cmd_len" && \
test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
......@@ -5854,10 +5857,6 @@ freebsd* | dragonfly*)
fi
;;
gnu*)
lt_cv_deplibs_check_method=pass_all
;;
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
......@@ -5896,7 +5895,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
......@@ -6993,7 +6992,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
case `/usr/bin/file conftest.o` in
*x86-64*)
LD="${LD-ld} -m elf32_x86_64"
;;
*)
LD="${LD-ld} -m elf_i386"
;;
esac
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
......@@ -8786,7 +8792,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
......@@ -10956,17 +10962,6 @@ freebsd* | dragonfly*)
esac
;;
gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
......@@ -11083,7 +11078,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
......@@ -12656,11 +12651,26 @@ if test "${enable_libdvdcss+set}" = set; then :
fi
# Check whether --enable-dlfcn was given.
if test "${enable_dlfcn+set}" = set; then :
enableval=$enable_dlfcn; use_builtin_dlfcn=$enableval
else
use_builtin_dlfcn=no
fi
if [ $use_builtin_dlfcn = "yes" ]; then
$as_echo "#define USING_BUILTIN_DLFCN 1" >>confdefs.h
fi
CSS_LIBS=""
if test x"$enable_libdvdcss" != xyes; then
case $host in
*mingw32*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
if [ $use_builtin_dlfcn = "no" ]; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
$as_echo_n "checking for dlopen in -lc... " >&6; }
if ${ac_cv_lib_c_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
......@@ -12738,12 +12748,14 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
DYNAMIC_LD_LIBS="-ldl"
else
as_fn_error $? "dynamic linker needed" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using builtin dlopen" >&5
$as_echo "$as_me: WARNING: Using builtin dlopen" >&2;}
fi
fi
fi
LDFLAGS="-no-undefined $LDFLAGS"
;;
*cygwin*)
......@@ -12910,6 +12922,7 @@ fi
CFLAGS="-O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $CFLAGS"
DEBUG_CFLAGS="-g -DDEBUG $CFLAGS"
......
......@@ -139,17 +139,29 @@ dnl dynamic linker
dnl ---------------------------------------------
AC_ARG_ENABLE([libdvdcss], [ --enable-libdvdcss force linking against libdvdcss])
AC_ARG_ENABLE([dlfcn],
[AS_HELP_STRING([--enable-dlfcn],
[use builtin dlfcn for mingw (default is auto)])],
[use_builtin_dlfcn=$enableval],
[use_builtin_dlfcn=no])
if [[ $use_builtin_dlfcn = "yes" ]]; then
AC_DEFINE([USING_BUILTIN_DLFCN], [1], ["Define to 1 to use builtin dlfcn"])
fi
CSS_LIBS=""
if test x"$enable_libdvdcss" != xyes; then
dnl dlopen libdvdcss
case $host in
*mingw32*)
AC_CHECK_LIB(c, dlopen,
DYNAMIC_LD_LIBS="",
AC_CHECK_LIB(dl, dlopen,
DYNAMIC_LD_LIBS="-ldl",
AC_MSG_ERROR(dynamic linker needed)))
AC_SUBST(DYNAMIC_LD_LIBS)
if [[ $use_builtin_dlfcn = "no" ]]; then
AC_CHECK_LIB(c, dlopen,
DYNAMIC_LD_LIBS="",
AC_CHECK_LIB(dl, dlopen,
DYNAMIC_LD_LIBS="-ldl",
AC_MSG_WARN(Using builtin dlopen)))
AC_SUBST(DYNAMIC_LD_LIBS)
fi
LDFLAGS="-no-undefined $LDFLAGS"
;;
*cygwin*)
......@@ -180,6 +192,7 @@ fi
AC_SUBST(CSS_LIBS)
dnl ---------------------------------------------
dnl cflags
dnl ---------------------------------------------
......
libdvdread (4.2.0+20121016-1) unstable; urgency=low
* Merging upstream version 4.2.0+20121016.
* Updating to standards version 3.9.4.
* Removing vts-tmapt.patch, included upstream.
* Removing array.patch, included upstream.
* Renumbering patches.
-- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 09 Dec 2012 07:26:47 +0100
libdvdread (4.2.0+20120521-3) unstable; urgency=low
* Adding patch from Peter Van Eynde <pvaneynd@debian.org> to fix
......
......@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Daniel Baumann <daniel.baumann@progress-technologies.net>
Build-Depends: debhelper (>= 9), autotools-dev
Standards-Version: 3.9.3
Standards-Version: 3.9.4
Homepage: http://github.com/microe/libdvdread
Package: libdvdread4
......
Author: Bryce Harrington <bryce@ubuntu.com>
Description:
Stifle the "Please send bug report - no VTS_TMAPT ??" message.
Upstream indicates it's merely a warning and not an indication
of a bug that needs reported (Closes: #281186, #281575, #316926,
#541723).
diff -Naurp libdvdread.orig/src/ifo_read.c libdvdread/src/ifo_read.c
--- libdvdread.orig/src/ifo_read.c 2012-06-29 22:20:05.645230527 +0200
+++ libdvdread/src/ifo_read.c 2012-06-29 22:31:13.183111184 +0200
@@ -1442,7 +1442,7 @@ int ifoRead_VTS_TMAPT(ifo_handle_t *ifof
if(ifofile->vtsi_mat->vts_tmapt == 0) { /* optional(?) */
ifofile->vts_tmapt = NULL;
- fprintf(stderr,"Please send bug report - no VTS_TMAPT ?? \n");
+ fprintf(stderr,"No VTS_TMAPT available - skipping.\n");
return 1;
}
Author: Doug Springer <gpib@rickyrockrat.net>
Description:
In the file ifo_read.c, function ifoRead_TT_SRPT, where a structure array is
allocated, but another variable, extracted from the DVD info determines the
lenght of the array, resulting in read/writes beyond the array. I truncate
the read, but perhaps a better solution would be to expand the malloc to
include the data off the DVD. I believe that, however could lead to out of
memory errors if the DVD data was bad/invalid.
.
With the applied patch, dvdbackup no longer segfaults (Closes: #649790).
diff -Naurp libdvdread.orig/src/ifo_read.c libdvdread/src/ifo_read.c
--- libdvdread.orig/src/ifo_read.c 2012-06-29 22:38:13.234838450 +0200
+++ libdvdread/src/ifo_read.c 2012-06-29 22:43:05.753445000 +0200
@@ -1081,6 +1081,12 @@ int ifoRead_TT_SRPT(ifo_handle_t *ifofil
return 0;
}
+ if(tt_srpt->nr_of_srpts>info_length/sizeof(title_info_t)){
+ fprintf(stderr,"libdvdread: data mismatch: info_length (%ld)!= nr_of_srpts (%d). Truncating.\n",
+ info_length/sizeof(title_info_t),tt_srpt->nr_of_srpts);
+ tt_srpt->nr_of_srpts=info_length/sizeof(title_info_t);
+ }
+
for(i = 0; i < tt_srpt->nr_of_srpts; i++) {
B2N_16(tt_srpt->title[i].nr_of_ptts);
B2N_16(tt_srpt->title[i].parental_id);
......@@ -4,6 +4,4 @@
04-version.patch
05-hurd.patch
06-descriptor.patch
07-vts-tmapt.patch
08-array.patch
09-segfault.patch
07-segfault.patch
......@@ -2,7 +2,7 @@
# libtool - Provide generalized library-building support services.
# Generated automatically by config.status (libdvdread) 4.2.0
# Libtool was configured on host progress:
# Libtool was configured on host notebook:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
......@@ -499,7 +499,7 @@ hardcode_action=immediate
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1
# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2
# automake: $automake_version
# autoconf: $autoconf_version
#
......@@ -509,7 +509,7 @@ hardcode_action=immediate
PROGRAM=libtool
PACKAGE=libtool
VERSION="2.4.2 Debian-2.4.2-1"
VERSION="2.4.2 Debian-2.4.2-1.2"
TIMESTAMP=""
package_revision=1.3337
......
......@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1
# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2
# automake: $automake_version
# autoconf: $autoconf_version
#
......@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
VERSION="2.4.2 Debian-2.4.2-1"
VERSION="2.4.2 Debian-2.4.2-1.2"
TIMESTAMP=""
package_revision=1.3337
......
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# m4/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# misc/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......
......@@ -9,8 +9,8 @@
#include <string.h>
#include <stdio.h>
#include "dlfcn.h"
#include "os_types.h"
#include "../include/dlfcn.h"
#include "../include/os_types.h"
void *dlopen(const char *module_name, int mode)
{
......
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# src/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......
......@@ -49,11 +49,13 @@ char * (*dvdinput_error) (dvd_input_t);
#else
/* dlopening libdvdcss */
#ifdef HAVE_DLFCN_H
#if defined(HAVE_DLFCN_H) && !defined(USING_BUILTIN_DLFCN)
#include <dlfcn.h>
#else
#if defined(WIN32)
/* Only needed on MINGW at the moment */
#include "../../msvc/contrib/dlfcn.c"
#include "../msvc/contrib/dlfcn.c"
#endif
#endif
typedef struct dvdcss_s *dvdcss_handle;
......
......@@ -35,6 +35,7 @@
/* misc win32 helpers */
#ifdef WIN32
#include <windows.h>
#ifndef HAVE_GETTIMEOFDAY
/* replacement gettimeofday implementation */
#include <sys/timeb.h>
......@@ -548,14 +549,17 @@ dvd_reader_t *DVDOpen( const char *ppath )
}
fclose( mntfile );
}
#elif defined(_WIN32) || defined(__OS2__)
#ifdef __OS2__
#elif defined(__OS2__)
/* Use DVDOpenImageFile() only if it is a drive */
if(isalpha(path[0]) && path[1] == ':' &&
( !path[2] ||
((path[2] == '\\' || path[2] == '/') && !path[3])))
#endif
auth_drive = DVDOpenImageFile( path, have_css );
#elif defined(_WIN32)
if( GetDriveType( path_copy ) == DRIVE_CDROM ) {
path_copy[2] = '\0';
auth_drive = DVDOpenImageFile( path_copy, have_css );
}
#endif
#if !defined(_WIN32) && !defined(__OS2__)
......
......@@ -1081,6 +1081,12 @@ int ifoRead_TT_SRPT(ifo_handle_t *ifofile) {
return 0;
}
if(tt_srpt->nr_of_srpts>info_length/sizeof(title_info_t)){
fprintf(stderr,"libdvdread: data mismatch: info_length (%ld)!= nr_of_srpts (%d). Truncating.\n",
info_length/sizeof(title_info_t),tt_srpt->nr_of_srpts);
tt_srpt->nr_of_srpts=info_length/sizeof(title_info_t);
}
for(i = 0; i < tt_srpt->nr_of_srpts; i++) {
B2N_16(tt_srpt->title[i].nr_of_ptts);
B2N_16(tt_srpt->title[i].parental_id);
......@@ -1442,7 +1448,7 @@ int ifoRead_VTS_TMAPT(ifo_handle_t *ifofile) {
if(ifofile->vtsi_mat->vts_tmapt == 0) { /* optional(?) */
ifofile->vts_tmapt = NULL;
fprintf(stderr,"Please send bug report - no VTS_TMAPT ?? \n");
fprintf(stderr,"libdvdread: No VTS_TMAPT available - skipping.\n");
return 1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment