From a3feefee20a86e152fa29531d9bb2eaa70e586bf Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 6 Aug 2008 22:13:35 +0100 Subject: Fix crashes with MP3 files with metadata consisting only of separators. --HG-- extra : transplant_source : %24%60%04%A8n%E9%86%FD%B6e8%F9%9C%88%A6%8FR%C2%BBP --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 8597e588f..b3dc760ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ xine-lib (1.1.15) 2008-??-?? - Delay preallocating video frames until we know how large they'll be - Only try and set the tuner if we're going to use it. Setting the tuner when using baseband video (CVBS, S-Video) breaks the input. + * Fix crashes with MP3 files with metadata consisting only of separators. * Fix crashes with fuzzed Windows Media files. xine-lib (1.1.14) 2008-06-29 -- cgit v1.2.3 From e9ab9917162330df3239199c2260255462f1cdfe Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 6 Aug 2008 22:34:37 +0100 Subject: Really fix the metadata bug... --- src/xine-engine/info_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c index 242805915..34d1bbdba 100644 --- a/src/xine-engine/info_helper.c +++ b/src/xine-engine/info_helper.c @@ -131,7 +131,7 @@ uint32_t _x_stream_info_get_public(xine_stream_t *stream, int info) { * at the end of the string */ static void meta_info_chomp(char *str) { - size_t i, len; + ssize_t i, len; len = strlen(str); if (!len) -- cgit v1.2.3 From 0b504bf028bf83ffc1783ae321f089e7b8406c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 8 Jul 2008 15:36:07 +0200 Subject: Avoid using strlen() in loops, calculate it beforehand. --HG-- extra : transplant_source : %80%12%03%93%EFL%FC%AF%A6%22Z%D0%95C%D5%29%AF%FB%95%B2 --- src/input/input_dvb.c | 11 ++++++----- src/input/libreal/sdpplin.c | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index bc279b78b..19b479a06 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -1664,21 +1664,22 @@ static void load_epg_data(dvb_input_plugin_t *this) } /* Prints text to an area, tries to cut the lines in between words. */ -static void render_text_area(osd_renderer_t* renderer, osd_object_t* osd, char* text, +static void render_text_area(osd_renderer_t* renderer, osd_object_t* osd, const char* text, int x, int y, int row_space, int max_x, int max_y, int* height, int color_base) { /* The position of the text to be printed. */ - char* cursor = text; + const char* cursor = text; + const char *const text_end = text + strlen(text); /* The line to be printed next. */ char text_line[512]; int text_width, text_height; size_t old_line_length, line_cursor; - char* bound, *old_bound; + const char* bound, *old_bound; *height = 0; - while (cursor < text + strlen(text)) { + while (cursor < text_end) { bound = cursor; line_cursor = 0; text_line[0] = '\0'; @@ -1735,7 +1736,7 @@ static void render_text_area(osd_renderer_t* renderer, osd_object_t* osd, char* } /* OK, it did fit, let's try to fit some more. */ - } while (bound < text + strlen(text)); + } while (bound < text_end); if (y + text_height + row_space > max_y) { break; diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c index f3672559c..c1fab49c1 100644 --- a/src/input/libreal/sdpplin.c +++ b/src/input/libreal/sdpplin.c @@ -60,7 +60,8 @@ static char *b64_decode(const char *in, char *out, int *size) k=0; /*CONSTANTCONDITION*/ - for (j=0; j Date: Tue, 8 Jul 2008 15:36:28 +0200 Subject: Rename flag so that NOFILE won't be redefining a system constant. --HG-- extra : transplant_source : %5B%DAd%7EO%08%09I%B0%95%9B%EDg-%60%CB%252%84%F2 --- src/demuxers/iff.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/demuxers/iff.h b/src/demuxers/iff.h index 94830f69c..8ac24a697 100644 --- a/src/demuxers/iff.h +++ b/src/demuxers/iff.h @@ -27,8 +27,8 @@ #define IFFP_IFF_H #define IFF_OKAY 0L -#define CLIENT_ERROR 1L -#define NOFILE 5L +#define IFF_CLIENT_ERROR 1L +#define IFF_NOFILE 5L #define FOURCC_CHUNK BE_FOURCC #define IFF_16SV_CHUNK FOURCC_CHUNK('1', '6', 'S', 'V') -- cgit v1.2.3 From d552d3b8f3149d66d359928d9626f2c34fddc02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 8 Jul 2008 15:50:55 +0200 Subject: Avoid definition of MAX that clashes with MAX() macro. --HG-- extra : transplant_source : %EFv%DC%FD%DA%23%BB%B8i3%07%A9e%C0%06o%9C%8A%B6_ --- src/post/goom/convolve_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/post/goom/convolve_fx.c b/src/post/goom/convolve_fx.c index e86bb3723..c394f3bf8 100644 --- a/src/post/goom/convolve_fx.c +++ b/src/post/goom/convolve_fx.c @@ -20,7 +20,7 @@ typedef char Motif[CONV_MOTIF_W][CONV_MOTIF_W]; #define NB_THETA 512 -#define MAX 2.0f +//#define MAX 2.0f typedef struct _CONV_DATA{ PluginParam light; -- cgit v1.2.3 From a9cbcc9a321b8baaf71b9a19d2b8ffde4390c6f9 Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Wed, 23 Jul 2008 11:13:20 +0100 Subject: Xv deinterlacing was looking at the input image size, not the output image size. This works fine on some chipsets, but on others, it causes image corruption. --- ChangeLog | 3 +++ src/video_out/video_out_xv.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b70acf6b0..868ee38e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ xine-lib (1.1.15) 2008-??-?? * V4L: Don't segfault if asked for an input that doesn't exist * Recognise AMR audio (normally found in 3GP files). * Recognise Snow video. + * Xv deinterlacing didn't take the size of the deinterlaced image into + account; on some chipsets, this would cause image corruption, while on + others, there would be no problem. xine-lib (1.1.14) 2008-06-29 * DVB changes: diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 8f5da8ea0..6a11ebc34 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -524,7 +524,7 @@ static void xv_deinterlace_frame (xv_driver_t *this) { for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ ) if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width && this->recent_frames[i]->height == frame->height ) - recent_bitmaps[i] = this->recent_frames[i]->image->data + frame->width*frame->height; + recent_bitmaps[i] = this->recent_frames[i]->image->data + this->deinterlace_frame.image->width*frame->height; else recent_bitmaps[i] = NULL; -- cgit v1.2.3 From a5d25b426a852306d74c4e4ecf39b1e3de289945 Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Mon, 28 Jul 2008 17:14:41 +0100 Subject: Preallocate after we know how large the frames will be (fixes a buffer overrun) --- ChangeLog | 2 ++ src/input/input_v4l.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 868ee38e6..f0066718d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ xine-lib (1.1.15) 2008-??-?? * Xv deinterlacing didn't take the size of the deinterlaced image into account; on some chipsets, this would cause image corruption, while on others, there would be no problem. + * V4L changes: + - Delay preallocating video frames until we know how large they'll be xine-lib (1.1.14) 2008-06-29 * DVB changes: diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 00c579c44..9e6b783e3 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -892,10 +892,6 @@ static int open_video_capture_device(v4l_input_plugin_t *this) _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - /* Pre-allocate some frames for audio and video so it doesn't have to be - * done during capture */ - allocate_frames(this, 1); - /* Unmute audio off video capture device */ unmute_audio(this); @@ -1004,7 +1000,11 @@ static int open_video_capture_device(v4l_input_plugin_t *this) xine_set_param(this->stream, XINE_PARAM_VO_ZOOM_X, 103); xine_set_param(this->stream, XINE_PARAM_VO_ZOOM_Y, 103); - + + /* Pre-allocate some frames for audio and video so it doesn't have to be + * done during capture */ + allocate_frames(this, 1); + /* If we made it here, everything went ok */ this->audio_only = 0; if (tuner_found) -- cgit v1.2.3 From 785fb4931f9d50716810cb4cc2355133fb37b462 Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Mon, 28 Jul 2008 17:17:39 +0100 Subject: Only set the tuner if we're going to use it (fixes baseband video inputs) --- ChangeLog | 2 ++ src/input/input_v4l.c | 16 ++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0066718d..274b18dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ xine-lib (1.1.15) 2008-??-?? others, there would be no problem. * V4L changes: - Delay preallocating video frames until we know how large they'll be + - Only try and set the tuner if we're going to use it. Setting the tuner + when using baseband video (CVBS, S-Video) breaks the input. xine-lib (1.1.14) 2008-06-29 * DVB changes: diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 9e6b783e3..b97f11ace 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -549,6 +549,12 @@ static int set_frequency(v4l_input_plugin_t *this, unsigned long frequency) fd = this->radio_fd; if (frequency != 0) { + /* FIXME: Don't assume tuner 0 ? */ + this->tuner = 0; + ret = ioctl(fd, VIDIOCSTUNER, &this->tuner); + lprintf("(%d) Response on set tuner to %d\n", ret, this->tuner); + this->video_tuner.tuner = this->tuner; + if (this->video_tuner.flags & VIDEO_TUNER_LOW) { this->calc_frequency = frequency * 16; } else { @@ -683,16 +689,6 @@ static int search_by_channel(v4l_input_plugin_t *this, char *input_source) ret = ioctl(fd, VIDIOCSCHAN, &this->input); lprintf("(%d) Set channel to %d\n", ret, this->input); - - /* FIXME: Don't assume tuner 0 ? */ - - this->tuner = 0; - - ret = ioctl(fd, VIDIOCSTUNER, &this->tuner); - - lprintf("(%d) Response on set tuner to %d\n", ret, this->tuner); - - this->video_tuner.tuner = this->tuner; } else { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: Not setting video source. No source given\n"); -- cgit v1.2.3 From 5be02c29c6239586e40a5d3296001302b5d6ab1a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 6 Aug 2008 22:09:07 +0100 Subject: Fix crashes with fuzzed Windows Media files. --HG-- extra : transplant_source : %92%2C%CB%01S%25N%22%E1%00%FB%19%B0%CE5%1BU%F9%F6%0A --- ChangeLog | 1 + src/demuxers/demux_asf.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 274b18dda..8597e588f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ xine-lib (1.1.15) 2008-??-?? - Delay preallocating video frames until we know how large they'll be - Only try and set the tuner if we're going to use it. Setting the tuner when using baseband video (CVBS, S-Video) breaks the input. + * Fix crashes with fuzzed Windows Media files. xine-lib (1.1.14) 2008-06-29 * DVB changes: diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 3af265ce4..3a0720043 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -70,6 +70,7 @@ #define ASF_MODE_HTTP_REF 2 #define ASF_MODE_ASF_REF 3 #define ASF_MODE_ENCRYPTED_CONTENT 4 +#define ASF_MODE_NO_CONTENT 5 typedef struct { int seq; @@ -443,6 +444,14 @@ static int asf_read_header (demux_asf_t *this) { asf_stream_t *asf_stream = this->asf_header->streams[i]; asf_demux_stream_t *demux_stream = &this->streams[i]; + if (!asf_stream && this->mode != ASF_MODE_NO_CONTENT) { + xine_log(this->stream->xine, XINE_LOG_MSG, + _("demux_asf: warning: The stream id=%d appears to be missing.\n"), asf_stream->stream_number); + _x_message(this->stream, XINE_MSG_READ_ERROR, + _("Media stream missing?"), NULL); + this->mode = ASF_MODE_NO_CONTENT; + } + if (asf_stream->encrypted_flag) { if (this->mode != ASF_MODE_ENCRYPTED_CONTENT) { xine_log(this->stream->xine, XINE_LOG_MSG, @@ -1679,6 +1688,7 @@ static int demux_asf_send_chunk (demux_plugin_t *this_gen) { return demux_asf_parse_asf_references(this); case ASF_MODE_ENCRYPTED_CONTENT: + case ASF_MODE_NO_CONTENT: this->status = DEMUX_FINISHED; return this->status; -- cgit v1.2.3 From a67ad6a9efa0d7d1f8c7b05ab2b2f3d8ecbad16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 7 Aug 2008 13:29:27 +0200 Subject: Make the CC_CHECK_* macro work when used in for loops. --- m4/attributes.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/m4/attributes.m4 b/m4/attributes.m4 index 3fee49ab5..9c4a0c89a 100644 --- a/m4/attributes.m4 +++ b/m4/attributes.m4 @@ -42,7 +42,7 @@ AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [ CFLAGS="$ac_save_CFLAGS" ]) - AS_IF([test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], [$2], [$3]) ]) @@ -52,7 +52,7 @@ AC_DEFUN([CC_CHECK_CFLAGS], [ CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here! ) - AS_IF([test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], [$2], [$3]) ]) @@ -67,7 +67,7 @@ AC_DEFUN([CC_CHECK_LDFLAGS], [ LDFLAGS="$ac_save_LDFLAGS" ]) - AS_IF([test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], + AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], [$2], [$3]) ]) @@ -100,7 +100,7 @@ AC_DEFUN([CC_CHECK_ATTRIBUTE], [ CFLAGS="$ac_save_CFLAGS" ]) - AS_IF([test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], + AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], [AC_DEFINE( AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] -- cgit v1.2.3 From 9dcd51af307ffb95852caf07083b1e6e698fe7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 7 Aug 2008 13:30:54 +0200 Subject: Ignore INSTALL file and don't track it, it's created by automake. --- .hgignore | 1 + INSTALL | 234 -------------------------------------------------------------- 2 files changed, 1 insertion(+), 234 deletions(-) delete mode 100644 INSTALL diff --git a/.hgignore b/.hgignore index 8c6021a84..cf9d8afcb 100644 --- a/.hgignore +++ b/.hgignore @@ -11,6 +11,7 @@ Makefile Makefile.in ABOUT-NLS +INSTALL aclocal.m4 compile configure diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 5458714e1..000000000 --- a/INSTALL +++ /dev/null @@ -1,234 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - -- cgit v1.2.3 From afa345a236a04cb2526fa9350b1767fdd9972fcf Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 7 Aug 2008 14:03:52 +0100 Subject: Fix crashes with fuzzed Ogg files. (CVE-2008-3231) --HG-- extra : transplant_source : %9F%E8R%D8%94R%9CJ%7F%5E%A7%DB%29%0DK%CD%CA%AD%7F%08 --- ChangeLog | 2 ++ src/demuxers/demux_ogg.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b3dc760ff..0482c3b93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ xine-lib (1.1.15) 2008-??-?? + * Security fixes: + - Fix crashes with corrupted Ogg files. (CVE-2008-3231) * Use external ffmpeg by default. * V4L: Don't segfault if asked for an input that doesn't exist * Recognise AMR audio (normally found in 3GP files). diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 2cbba982f..9e9de45aa 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -1357,7 +1357,7 @@ static void send_header (demux_ogg_t *this) { this->ignore_keyframes = 0; while (!done) { - if (!read_ogg_packet(this)) { + if (!read_ogg_packet(this) || !this->og.header || !this->og.body) { return; } /* now we've got at least one new page */ @@ -1483,6 +1483,12 @@ static int demux_ogg_send_chunk (demux_plugin_t *this_gen) { return this->status; } + if (!this->og.header || !this->og.body) { + this->status = DEMUX_FINISHED; + lprintf ("EOF\n"); + return this->status; + } + /* now we've got one new page */ cur_serno = ogg_page_serialno (&this->og); -- cgit v1.2.3 From 8d62edd3e97c028aa15ed9504f182d7dc64b59d4 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 7 Aug 2008 14:08:06 +0100 Subject: Rearrange changelog entries for 1.1.15 wrt security issues. --HG-- extra : transplant_source : %1A%0Fu%1062y%F6I%0A%AF%97%85%3Fr%F6%17%20%01W --- ChangeLog | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0482c3b93..b5bb357f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,19 +1,18 @@ xine-lib (1.1.15) 2008-??-?? * Security fixes: - Fix crashes with corrupted Ogg files. (CVE-2008-3231) + - Fix crashes with fuzzed Windows Media files. + - Delay V4L video frame preallocation until we know how large they'll be. * Use external ffmpeg by default. - * V4L: Don't segfault if asked for an input that doesn't exist + * V4L: Don't segfault if asked for an input that doesn't exist. * Recognise AMR audio (normally found in 3GP files). * Recognise Snow video. * Xv deinterlacing didn't take the size of the deinterlaced image into account; on some chipsets, this would cause image corruption, while on others, there would be no problem. - * V4L changes: - - Delay preallocating video frames until we know how large they'll be - - Only try and set the tuner if we're going to use it. Setting the tuner - when using baseband video (CVBS, S-Video) breaks the input. + * V4L: only try and set the tuner if we're going to use it. Setting the tuner + when using baseband video (CVBS, S-Video) breaks the input. * Fix crashes with MP3 files with metadata consisting only of separators. - * Fix crashes with fuzzed Windows Media files. xine-lib (1.1.14) 2008-06-29 * DVB changes: -- cgit v1.2.3 From 187ae21aaeee0c4c1a6aee2b9808b884af827437 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 7 Aug 2008 18:51:26 +0100 Subject: Fix a segfault introduced in the Windows Media crash fix. --- src/demuxers/demux_asf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 3a0720043..9d4191633 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -444,13 +444,16 @@ static int asf_read_header (demux_asf_t *this) { asf_stream_t *asf_stream = this->asf_header->streams[i]; asf_demux_stream_t *demux_stream = &this->streams[i]; - if (!asf_stream && this->mode != ASF_MODE_NO_CONTENT) { + if (!asf_stream) { + if (this->mode != ASF_MODE_NO_CONTENT) { xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_asf: warning: The stream id=%d appears to be missing.\n"), asf_stream->stream_number); + _("demux_asf: warning: A stream appears to be missing.\n")); _x_message(this->stream, XINE_MSG_READ_ERROR, _("Media stream missing?"), NULL); this->mode = ASF_MODE_NO_CONTENT; } + return 0; + } if (asf_stream->encrypted_flag) { if (this->mode != ASF_MODE_ENCRYPTED_CONTENT) { -- cgit v1.2.3