diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.am | 1 | ||||
| -rw-r--r-- | misc/Makefile.plugins.in | 1 | ||||
| -rw-r--r-- | misc/cdda_server.c | 11 | ||||
| -rw-r--r-- | misc/fonts/Makefile.am | 2 | ||||
| -rw-r--r-- | misc/xine-lib.spec.in | 4 |
5 files changed, 16 insertions, 3 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am index 1ab4097c5..7f7e8db7c 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = build_rpms.sh \ xine-lib.spec \ libxine.pc.in \ libdvdcss-1.2.6-network.patch \ + Makefile.plugins.in \ Makefile.common bin_SCRIPTS = xine-config diff --git a/misc/Makefile.plugins.in b/misc/Makefile.plugins.in new file mode 100644 index 000000000..adee79479 --- /dev/null +++ b/misc/Makefile.plugins.in @@ -0,0 +1 @@ +DESTDIR:=$(if $(DESTDIR),$(DESTDIR),@LIBTOOL_DESTDIR_DEFAULT@) diff --git a/misc/cdda_server.c b/misc/cdda_server.c index 553ec0a8a..0e2817db3 100644 --- a/misc/cdda_server.c +++ b/misc/cdda_server.c @@ -480,6 +480,12 @@ static int process_commands( int socket ) sscanf(cmd,"%*s %d %d", &start_frame, &num_frames); + if (num_frames > INT_MAX / CD_RAW_FRAME_SIZE) + { + printf ("fatal error: integer overflow\n"); + exit (1); + } + n = num_frames * CD_RAW_FRAME_SIZE; buf = malloc( n ); if( !buf ) @@ -556,6 +562,11 @@ static int process_commands( int socket ) char *buf; sscanf(cmd,"%*s %d %d", &blocks, &flags); + if (blocks > INT_MAX / DVD_BLOCK_SIZE) + { + printf ("fatal error: integer overflow\n"); + exit (1); + } n = blocks * DVD_BLOCK_SIZE; buf = malloc( n ); diff --git a/misc/fonts/Makefile.am b/misc/fonts/Makefile.am index ae22beefa..f5b131886 100644 --- a/misc/fonts/Makefile.am +++ b/misc/fonts/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -fontdir = $(XINE_FONTPATH) +fontdir = $(XINE_FONTDIR) font_DATA = \ cetus-16.xinefont.gz \ cetus-20.xinefont.gz \ diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index 453ffa306..952c5e0d2 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -79,8 +79,8 @@ Version: %{version} Release: %{release} License: GPL Group: Development/Libraries -URL: http://xinehq.de -Source: http://xinehq.de/files/@PACKAGE@-@VERSION@.tar.bz2 +URL: http://www.xine-project.org +Source: http://prdownloads.sourceforge.net/xine/@PACKAGE@-@VERSION@.tar.bz2 Packager: Manfred Tremmel <Manfred.Tremmel@iiv.de> Obsoletes: xine Obsoletes: xine-lib |