Merge from 1.2 branch.

48 files changed, 329 insertions, 501 deletions

diff --git a/ChangeLog b/ChangeLog
index 418bcb0b8..406fc0494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,7 @@ xine-lib (1.1.9) (unreleased)
   * Build fix for when using Linux 2.6.23 headers. [Bug 1820958]
   * Implemented decoding of XML character entities with codes >= 256.
     This requires conversion to UTF-8 of entities with codes >= 128.
+  * Handle initial Unicde BOMs in XML; convert other UTF encodings to UTF-8.
   * Fixed ATSC support. [Bug 1749508]
   * Fixed a possible DVB plugin crash when switching channels.
   * Fixed a crash closing the frontend. [Bug FS#3]
@@ -80,6 +81,10 @@ xine-lib (1.1.9) (unreleased)
   * DXR3 encoding with external ffmpeg should be fixed now.
     (This was broken by ffmpeg revision 9283).
   * Enabled the WMV VC1 (ffmpeg) codec.
+  * Fixed a crash that happened when a video output was closed
+  * Made the Real demuxer recognise http references.
+  * Require correct URL encoding of '#'s which aren't separators.
+  * Don't decode %nn in raw filenames. [Bug 1784272]
 
 xine-lib (1.1.8)
   * Send a channel-changed event to the frontend when receiving the SYNC
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 1a26b01e9..40dc7ffed 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -138,7 +138,7 @@ static int my_snd_mixer_wait(snd_mixer_t *mixer, int timeout) {
     return count;
   
   if ((unsigned int) count > sizeof(spfds) / sizeof(spfds[0])) {
-    pfds = malloc(count * sizeof(*pfds));
+    pfds = calloc(count, sizeof(*pfds));
     
     if (!pfds)
       return -ENOMEM;
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 5576b1d5f..5b4faada5 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -1035,20 +1035,14 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
     if ((parse = strstr(mixer_name, "dsp"))) {
       parse[0] = '\0';
       parse += 3;
-      this->mixer.name = (char *)malloc(strlen(mixer_name) + sizeof("mixer") + 2);
       if (devname_val == 0)
-	sprintf(this->mixer.name, "%smixer%s", mixer_name, parse);
-      else {
-	if (mixer_num == -1)
-	  sprintf(this->mixer.name, "%smixer", mixer_name);
-	else
-	  sprintf(this->mixer.name, "%smixer%d", mixer_name, mixer_num);
-      }
-    } else {
-      this->mixer.name = (char *)malloc(1);
-      this->mixer.name[0] = '\0';
+	asprintf(&this->mixer.name, "%smixer%s", mixer_name, parse);
+      else if (mixer_num == -1)
+	asprintf(&this->mixer.name, "%smixer", mixer_name);
+      else
+	asprintf(&this->mixer.name, "%smixer%d", mixer_name, mixer_num);
     }
-    _x_assert(this->mixer.name[0] != '\0');
+    _x_assert(this->mixer.name);
     
     this->mixer.fd = open(this->mixer.name, O_RDONLY);
 
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
index cb7db0364..9ec024d71 100644
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -388,7 +388,7 @@ init_plugin (xine_t *xine, void *data) {
     this->decoder_class.open_plugin     = open_plugin;
     this->decoder_class.identifier      = "flacdec";
     this->decoder_class.description     = N_("flac audio decoder plugin");
-    this->decoder_class.dispose         = default_audio_decoder_dispose;
+    this->decoder_class.dispose         = default_audio_decoder_class_dispose;
 
 
     return this;
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index ac5c66a8d..310f4cecb 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -302,12 +302,6 @@ static int demux_wv_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_wv_dispose (demux_plugin_t *const this_gen) {
-  demux_wv_t *const this = (demux_wv_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_wv_get_status (demux_plugin_t *const this_gen) {
   const demux_wv_t *const this = (const demux_wv_t *) this_gen;
 
@@ -339,7 +333,7 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
   this->demux_plugin.send_headers      = demux_wv_send_headers;
   this->demux_plugin.send_chunk        = demux_wv_send_chunk;
   this->demux_plugin.seek              = demux_wv_seek;
-  this->demux_plugin.dispose           = demux_wv_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_wv_get_status;
   this->demux_plugin.get_stream_length = demux_wv_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_wv_get_capabilities;
diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c
index 26a61d8fd..23692574e 100644
--- a/src/demuxers/asfheader.c
+++ b/src/demuxers/asfheader.c
@@ -63,7 +63,6 @@ struct asf_header_internal_s {
   /* private part */

   int                     number_count;

   uint16_t                numbers[ASF_MAX_NUM_STREAMS];

-  iconv_t                 iconv_cd;

   uint8_t                *bitrate_pointers[ASF_MAX_NUM_STREAMS];

 };

 

@@ -130,8 +129,7 @@ static uint8_t *asf_reader_get_bytes(asf_reader_t *reader, size_t size) {
 

   if ((reader->size - reader->pos) < size)

     return NULL;

-  buffer = malloc(size);

-  if (!buffer)

+  if (! (buffer = malloc(size)) )

     return NULL;

   memcpy(buffer, reader->buffer + reader->pos, size);

   reader->pos += size;

@@ -241,8 +239,7 @@ static int asf_header_parse_file_properties(asf_header_t *header, uint8_t *buffe
     return 0;

   }

 

-  asf_file = malloc(sizeof(asf_file_t));

-  if (!asf_file) {

+  if (! (asf_file = malloc(sizeof(asf_file_t))) ) {

     lprintf("cannot allocate asf_file_struct\n");

     return 0;

   }

@@ -296,8 +293,7 @@ static int asf_header_parse_stream_properties(asf_header_t *header, uint8_t *buf
   if (buffer_len < 54)

     goto exit_error;

 

-  asf_stream = malloc(sizeof(asf_stream_t));

-  if (!asf_stream)

+  if (! (asf_stream = malloc(sizeof(asf_stream_t))) )

     goto exit_error;

 

   asf_reader_init(&reader, buffer, buffer_len);

@@ -363,8 +359,7 @@ static int asf_header_parse_stream_extended_properties(asf_header_t *header, uin
   if (buffer_len < 64)

     return 0;

 

-  asf_stream_extension = malloc(sizeof(asf_stream_extension_t));

-  if (!asf_stream_extension)

+  if (! (asf_stream_extension = malloc(sizeof(asf_stream_extension_t))) )

     return 0;

 

   asf_reader_init(&reader, buffer, buffer_len);

@@ -577,14 +572,16 @@ static int asf_header_parse_content_description(asf_header_t *header_pub, uint8_
   asf_reader_t reader;

   asf_content_t *content;

   uint16_t title_length, author_length, copyright_length, description_length, rating_length;

+  iconv_t iconv_cd;

 

   if (buffer_len < 10)

     return 0;

 

-  content = malloc(sizeof(asf_content_t));

-  if (!content)

+  if (! (content = calloc(1, sizeof(asf_content_t))) )

+    return 0;

+

+  if ( (iconv_cd = iconv_open("UTF-8", "UCS-2LE")) == (iconv_t)-1 )

     return 0;

-  memset(content, 0, sizeof(asf_content_t));

 

   asf_reader_init(&reader, buffer, buffer_len);

   asf_reader_get_16(&reader, &title_length);

@@ -593,13 +590,15 @@ static int asf_header_parse_content_description(asf_header_t *header_pub, uint8_
   asf_reader_get_16(&reader, &description_length);

   asf_reader_get_16(&reader, &rating_length);

 

-  content->title = asf_reader_get_string(&reader, title_length, header->iconv_cd);

-  content->author = asf_reader_get_string(&reader, author_length, header->iconv_cd);

-  content->copyright = asf_reader_get_string(&reader, copyright_length, header->iconv_cd);

-  content->description = asf_reader_get_string(&reader, description_length, header->iconv_cd);

-  content->rating = asf_reader_get_string(&reader, rating_length, header->iconv_cd);

+  content->title = asf_reader_get_string(&reader, title_length, iconv_cd);

+  content->author = asf_reader_get_string(&reader, author_length, iconv_cd);

+  content->copyright = asf_reader_get_string(&reader, copyright_length, iconv_cd);

+  content->description = asf_reader_get_string(&reader, description_length, iconv_cd);

+  content->rating = asf_reader_get_string(&reader, rating_length, iconv_cd);

 

   header->pub.content = content;

+

+  iconv_close(iconv_cd);

   return 1;

 }

 

@@ -611,24 +610,14 @@ asf_header_t *asf_header_new (uint8_t *buffer, int buffer_len) {
   uint32_t object_count;

   uint16_t junk;

 

-  asf_header = malloc(sizeof(asf_header_internal_t));

-  if (!asf_header)

-    return NULL;

-  memset(asf_header, 0, sizeof(asf_header_internal_t));

-

   lprintf("parsing_asf_header\n");

   if (buffer_len < 6) {

     printf("invalid buffer size\n");

-    free(asf_header);

     return NULL;

   }

 

-  asf_header->iconv_cd = iconv_open ("UTF-8", "UCS-2LE");

-  if (asf_header->iconv_cd == (iconv_t)-1) {

-    printf("iconv open error\n");

-    free(asf_header);

+  if (! (asf_header = calloc(1, sizeof(asf_header_internal_t))) )

     return NULL;

-  }

 

   asf_reader_init(&reader, buffer, buffer_len);

   asf_reader_get_32(&reader, &object_count);

@@ -697,10 +686,8 @@ asf_header_t *asf_header_new (uint8_t *buffer, int buffer_len) {
   }

   if (!asf_header->pub.content) {

     lprintf("no content object present\n");

-    asf_header->pub.content = malloc(sizeof(asf_content_t));

-    if (!asf_header->pub.content)

+    if (! (asf_header->pub.content = calloc(1, sizeof(asf_content_t))) )

       goto exit_error;

-    memset(asf_header->pub.content, 0, sizeof(asf_content_t));

   }

 

   return &asf_header->pub;

@@ -766,9 +753,6 @@ void asf_header_delete (asf_header_t *header_pub) {
       asf_header_delete_stream_extended_properties(header->pub.stream_extensions[i]);

   }

   

-  if (header->iconv_cd != (iconv_t)-1)

-    iconv_close (header->iconv_cd);

-

   free(header);

 }

 

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 889299beb..f5091035b 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -612,14 +612,14 @@ static int demux_asf_send_headers_common (demux_asf_t *this) {
 }
 
 static void asf_reorder(demux_asf_t *this, uint8_t *src, int len){
-  uint8_t *dst = malloc(len);
+  uint8_t dst[len];
   uint8_t *s2 = src;
   int i = 0, x, y;
 
   while(len-i >= this->reorder_h * this->reorder_w*this->reorder_b){
         for(x = 0; x < this->reorder_w; x++)
           for(y = 0; y < this->reorder_h; y++){
-            memcpy(dst + i, s2 + (y * this->reorder_w+x) * this->reorder_b,
+            memcpy(&dst[i], s2 + (y * this->reorder_w+x) * this->reorder_b,
                    this->reorder_b);
             i += this->reorder_b;
           }
@@ -627,7 +627,6 @@ static void asf_reorder(demux_asf_t *this, uint8_t *src, int len){
   }
 
   xine_fast_memcpy(src,dst,i);
-  free(dst);
 }
 
 /* redefine abs as macro to handle 64-bit diffs.
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index f0b29532b..7f9dec5fe 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -870,6 +870,30 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
+static const char *get_description (demux_class_t *this_gen) {
+  return "Flash Video file demux plugin";
+}
+
+static const char *get_identifier (demux_class_t *this_gen) {
+  return "FLV";
+}
+
+static const char *get_extensions (demux_class_t *this_gen) {
+  return "flv";
+}
+
+static const char *get_mimetypes (demux_class_t *this_gen) {
+  return "video/x-flv: flv: Flash video;"
+         "video/flv: flv: Flash video;"
+         "application/x-flash-video: flv: Flash video;";
+}
+
+static void class_dispose (demux_class_t *this_gen) {
+  demux_flv_class_t *this = (demux_flv_class_t *) this_gen;
+
+  free (this);
+}
+
 static void *init_plugin (xine_t *xine, void *data) {
   demux_flv_class_t     *this;
 
@@ -878,7 +902,9 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Flash Video file demux plugin");
   this->demux_class.identifier      = "FLV";
-  this->demux_class.mimetypes       = "video/x-flv: flv: Flash video;";
+  this->demux_class.mimetypes       = "video/x-flv: flv: Flash video;"
+				      "video/flv: flv: Flash video;"
+				      "application/x-flash-video: flv: Flash video;";
   this->demux_class.extensions      = "flv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
@@ -897,3 +923,4 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
   { PLUGIN_DEMUX, 27, "flashvideo", XINE_VERSION_CODE, &demux_info_flv, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
+
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index f8166173a..16cf87978 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -1749,10 +1749,7 @@ static int parse_tags(demux_matroska_t *this) {
 static void alloc_block_data (demux_matroska_t *this, int len) {
   /* memory management */
   if (this->block_data_size < len) {
-    if (this->block_data)
-      this->block_data = realloc(this->block_data, len);
-    else
-      this->block_data = malloc(len);
+    this->block_data = realloc(this->block_data, len);
     this->block_data_size = len;
   }
 }
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index e6ae7df8d..3b6aa24bc 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -1454,39 +1454,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_MRL: {
-    char *ending;
-
-    const char *const mrl = input->get_mrl (input);
-
-    if(!strncmp(mrl, "vcd:", 4)) {
-      this->blocksize = 2324;
-      demux_mpeg_block_accept_input (this, input);
-    } else if(!strncmp(mrl, "dvd:", 4) || !strncmp(mrl, "pvr:", 4)) {
-      this->blocksize = 2048;
-      demux_mpeg_block_accept_input (this, input);
-    } else {
-      ending = strrchr(mrl, '.');
-
-      if (!ending) {
-        av_free (this->scratch);
-        free (this);
-        return NULL;
-      }
-      if ( (!strncasecmp (ending, ".vob", 4)) ||
-	   (!strncmp((ending + 3), "mpeg2", 5)) ||
-	   (!strncmp((ending + 3), "mpeg1", 5)) ) {
-        this->blocksize = 2048;
-        demux_mpeg_block_accept_input(this, input);
-      } else {
-        av_free (this->scratch);
-        free (this);
-        return NULL;
-      }
-    }
-  }
-  break;
-
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT: {
 
     this->blocksize = input->get_blocksize(input);
@@ -1527,7 +1495,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.description     = N_("DVD/VOB demux plugin");
   this->demux_class.identifier      = "MPEG_BLOCK";
   this->demux_class.mimetypes       = NULL;
-  this->demux_class.extensions      = "vob";
+  this->demux_class.extensions      = "vob vcd:/ dvd:/ pvr:/";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 64fe764a4..f1a36a235 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1756,7 +1756,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.description     = N_("mpeg pes demux plugin");
   this->demux_class.identifier      = "MPEG_PES";
   this->demux_class.mimetypes       = NULL;
-  this->demux_class.extensions      = "pes";
+  this->demux_class.extensions      = "pes vdr:/ netvdr:/";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index b46cbc593..8fb554de2 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -651,8 +651,7 @@ static void free_qt_info(qt_info *info) {
         for (j = 0; j < info->traks[i].stsd_atoms_count; j++) {
           if (info->traks[i].type == MEDIA_AUDIO) {
             free(info->traks[i].stsd_atoms[j].audio.properties_atom);
-            if (info->traks[i].stsd_atoms[j].audio.wave)
-              free(info->traks[i].stsd_atoms[j].audio.wave);
+	    free(info->traks[i].stsd_atoms[j].audio.wave);
           } else if (info->traks[i].type == MEDIA_VIDEO)
             free(info->traks[i].stsd_atoms[j].video.properties_atom);
         }
@@ -686,34 +685,28 @@ static int is_qt_file(input_plugin_t *qt_file) {
   off_t moov_atom_offset = -1;
   int64_t moov_atom_size = -1;
   int i;
-  unsigned char atom_preamble[ATOM_PREAMBLE_SIZE];
-  unsigned char preview[MAX_PREVIEW_SIZE];
   int len;
 
   /* if the input is non-seekable, be much more stringent about qualifying
    * a QT file: In this case, the moov must be the first atom in the file */
   if ((qt_file->get_capabilities(qt_file) & INPUT_CAP_SEEKABLE) == 0) {
-    memset (&preview, 0, MAX_PREVIEW_SIZE);
+    unsigned char preview[MAX_PREVIEW_SIZE] = { 0, };
     len = qt_file->get_optional_data(qt_file, preview, INPUT_OPTIONAL_DATA_PREVIEW);
     if (_X_BE_32(&preview[4]) == MOOV_ATOM)
       return 1;
     else {
-      if (_X_BE_32(&preview[4]) == FTYP_ATOM) {
-        /* show some lenience if the first atom is 'ftyp'; the second atom
-         * could be 'moov' */
-        moov_atom_size = _X_BE_32(&preview[0]);
-        /* compute the size of the current atom plus the preamble of the
-         * next atom; if the size is within the range on the preview buffer
-         * then the next atom's preamble is in the preview buffer */
-        i = moov_atom_size + ATOM_PREAMBLE_SIZE;
-        if (i >= MAX_PREVIEW_SIZE)
-          return 0;
-        if (_X_BE_32(&preview[i - 4]) == MOOV_ATOM)
-          return 1;
-        else
-          return 0;
-      } else
-        return 0;
+      if (_X_BE_32(&preview[4]) != FTYP_ATOM)
+	return 0;
+
+      /* show some lenience if the first atom is 'ftyp'; the second atom
+       * could be 'moov'
+       * compute the size of the current atom plus the preamble of the
+       * next atom; if the size is within the range on the preview buffer
+       * then the next atom's preamble is in the preview buffer */
+      uint64_t ftyp_atom_size = _X_BE_32(&preview[0]) + ATOM_PREAMBLE_SIZE;
+      if (ftyp_atom_size >= MAX_PREVIEW_SIZE)
+	return 0;
+      return _X_BE_32(&preview[ftyp_atom_size - 4]) == MOOV_ATOM;
     }
   }
 
@@ -721,6 +714,7 @@ static int is_qt_file(input_plugin_t *qt_file) {
   if (moov_atom_offset == -1) {
     return 0;
   } else {
+    unsigned char atom_preamble[ATOM_PREAMBLE_SIZE];
     /* check that the next atom in the chunk contains alphanumeric
      * characters in the atom type field; if not, disqualify the file 
      * as a QT file */
@@ -807,31 +801,33 @@ static void parse_meta_atom(qt_info *info, unsigned char *meta_atom) {
 	const uint8_t *const sub_atom = &meta_atom[j];
 	const qt_atom sub_atom_code = _X_BE_32(&sub_atom[4]);
 	const uint32_t sub_atom_size = _X_BE_32(&sub_atom[0]);
+	char *const data_atom = parse_data_atom(&sub_atom[8]);
 
 	switch(sub_atom_code) {
 	case ART_ATOM:
-	  info->artist = parse_data_atom(&sub_atom[8]);
+	  info->artist = data_atom;
 	  break;
 	case NAM_ATOM:
-	  info->name = parse_data_atom(&sub_atom[8]);
+	  info->name = data_atom;
 	  break;
 	case ALB_ATOM:
-	  info->album = parse_data_atom(&sub_atom[8]);
+	  info->album = data_atom;
 	  break;
 	case GEN_ATOM:
-	  info->genre = parse_data_atom(&sub_atom[8]);
+	  info->genre = data_atom;
 	  break;
 	case CMT_ATOM:
-	  info->comment = parse_data_atom(&sub_atom[8]);
+	  info->comment = data_atom;
 	  break;
 	case WRT_ATOM:
-	  info->composer = parse_data_atom(&sub_atom[8]);
+	  info->composer = data_atom;
 	  break;
 	case DAY_ATOM:
-	  info->year = parse_data_atom(&sub_atom[8]);
+	  info->year = data_atom;
 	  break;
 	default:
 	  debug_meta_load("unknown atom %08x in ilst\n", sub_atom_code);
+	  free(data_atom);
 	}
 
 	j += sub_atom_size;
@@ -1008,18 +1004,17 @@ static qt_error parse_trak_atom (qt_trak *trak,
 
         const uint32_t current_stsd_atom_size = _X_BE_32(&trak_atom[atom_pos - 4]);      
 
-	/* for palette traversal */
-	int color_depth;
-	int color_flag;
-	int color_start;
-	int color_count;
-	int color_end;
-	int color_index;
-	int color_dec;
-	int color_greyscale;
-	const unsigned char *color_table;
-
         if (trak->type == MEDIA_VIDEO) {
+	  /* for palette traversal */
+	  int color_depth;
+	  int color_flag;
+	  int color_start;
+	  int color_count;
+	  int color_end;
+	  int color_index;
+	  int color_dec;
+	  int color_greyscale;
+	  const unsigned char *color_table;
 
           trak->stsd_atoms[k].video.media_id = k + 1;
           trak->stsd_atoms[k].video.properties_offset = properties_offset;
@@ -1464,8 +1459,7 @@ static qt_error parse_trak_atom (qt_trak *trak,
       debug_atom_load("    qt stco atom (32-bit chunk offset atom): %d chunk offsets\n",
         trak->chunk_offset_count);
 
-      trak->chunk_offset_table = (int64_t *)malloc(
-        trak->chunk_offset_count * sizeof(int64_t));
+      trak->chunk_offset_table = calloc(trak->chunk_offset_count, sizeof(int64_t));
       if (!trak->chunk_offset_table) {
         last_error = QT_NO_MEMORY;
         goto free_trak;
@@ -1492,8 +1486,7 @@ static qt_error parse_trak_atom (qt_trak *trak,
       debug_atom_load("    qt co64 atom (64-bit chunk offset atom): %d chunk offsets\n",
         trak->chunk_offset_count);
 
-      trak->chunk_offset_table = (int64_t *)malloc(
-        trak->chunk_offset_count * sizeof(int64_t));
+      trak->chunk_offset_table = calloc(trak->chunk_offset_count, sizeof(int64_t));
       if (!trak->chunk_offset_table) {
         last_error = QT_NO_MEMORY;
         goto free_trak;
@@ -1523,8 +1516,7 @@ static qt_error parse_trak_atom (qt_trak *trak,
       debug_atom_load("    qt stsc atom (sample-to-chunk atom): %d entries\n",
         trak->sample_to_chunk_count);
 
-      trak->sample_to_chunk_table = (sample_to_chunk_table_t *)malloc(
-        trak->sample_to_chunk_count * sizeof(sample_to_chunk_table_t));
+      trak->sample_to_chunk_table = calloc(trak->sample_to_chunk_count, sizeof(sample_to_chunk_table_t));
       if (!trak->sample_to_chunk_table) {
         last_error = QT_NO_MEMORY;
         goto free_trak;
@@ -1558,8 +1550,7 @@ static qt_error parse_trak_atom (qt_trak *trak,
       debug_atom_load("    qt stts atom (time-to-sample atom): %d entries\n",
         trak->time_to_sample_count);
 
-      trak->time_to_sample_table = (time_to_sample_table_t *)malloc(
-        (trak->time_to_sample_count+1) * sizeof(time_to_sample_table_t));
+      trak->time_to_sample_table = calloc(trak->time_to_sample_count+1, sizeof(time_to_sample_table_t));
       if (!trak->time_to_sample_table) {
         last_error = QT_NO_MEMORY;
         goto free_trak;
@@ -1752,8 +1743,7 @@ static qt_error build_frame_table(qt_trak *trak,
     /* in this case, the total number of frames is equal to the number of
      * entries in the sample size table */
     trak->frame_count = trak->sample_size_count;
-    trak->frames = (qt_frame *)malloc(
-      trak->frame_count * sizeof(qt_frame));
+    trak->frames = calloc(trak->frame_count, sizeof(qt_frame));
     if (!trak->frames)
       return QT_NO_MEMORY;
     trak->current_frame = 0;
@@ -1765,10 +1755,9 @@ static qt_error build_frame_table(qt_trak *trak,
     pts_index_countdown =
       trak->time_to_sample_table[pts_index].count;
 
-    media_id_counts = xine_xmalloc(trak->stsd_atoms_count * sizeof(int));
+    media_id_counts = xine_xcalloc(trak->stsd_atoms_count, sizeof(int));
     if (!media_id_counts)
       return QT_NO_MEMORY;
-    memset(media_id_counts, 0, trak->stsd_atoms_count * sizeof(int));
 
     /* iterate through each start chunk in the stsc table */
     for (i = 0; i < trak->sample_to_chunk_count; i++) {
@@ -1903,8 +1892,7 @@ static qt_error build_frame_table(qt_trak *trak,
     /* in this case, the total number of frames is equal to the number of
      * chunks */
     trak->frame_count = trak->chunk_offset_count;
-    trak->frames = (qt_frame *)malloc(
-      trak->frame_count * sizeof(qt_frame));
+    trak->frames = calloc(trak->frame_count, sizeof(qt_frame));
     if (!trak->frames)
       return QT_NO_MEMORY;
 
@@ -2146,7 +2134,6 @@ static qt_error open_qt_file(qt_info *info, input_plugin_t *input,
   unsigned char *moov_atom = NULL;
   off_t moov_atom_offset = -1;
   int64_t moov_atom_size = -1;
-  unsigned char preview[MAX_PREVIEW_SIZE];
 
   /* zlib stuff */
   z_stream z_state;
@@ -2169,7 +2156,7 @@ static qt_error open_qt_file(qt_info *info, input_plugin_t *input,
   if ((input->get_capabilities(input) & INPUT_CAP_SEEKABLE))
     find_moov_atom(input, &moov_atom_offset, &moov_atom_size);
   else {
-    memset (&preview, 0, MAX_PREVIEW_SIZE);
+    unsigned char preview[MAX_PREVIEW_SIZE] = { 0, };
     input->get_optional_data(input, preview, INPUT_OPTIONAL_DATA_PREVIEW);
     if (_X_BE_32(&preview[4]) != MOOV_ATOM) {
       /* special case if there is an ftyp atom first */
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 761296ac4..962030083 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -232,7 +232,7 @@ static void real_parse_index(demux_real_t *this) {
 
       if(index && entries) {
         /* Allocate memory for index */
-        *index = xine_xmalloc(entries * sizeof(real_index_entry_t));
+        *index = xine_xcalloc(entries, sizeof(real_index_entry_t));
         
         /* Read index */
         for(i = 0; i < entries; i++) {
@@ -275,17 +275,17 @@ static mdpr_t *real_parse_mdpr(const char *data) {
   mdpr->duration=_X_BE_32(&data[28]);
 
   mdpr->stream_name_size=data[32];
-  mdpr->stream_name=malloc(sizeof(char)*(mdpr->stream_name_size+1));
+  mdpr->stream_name=calloc(mdpr->stream_name_size+1, sizeof(char));
   memcpy(mdpr->stream_name, &data[33], mdpr->stream_name_size);
   mdpr->stream_name[(int)mdpr->stream_name_size]=0;
 
   mdpr->mime_type_size=data[33+mdpr->stream_name_size];
-  mdpr->mime_type=malloc(sizeof(char)*(mdpr->mime_type_size+1));
+  mdpr->mime_type=calloc(mdpr->mime_type_size+1, sizeof(char));
   memcpy(mdpr->mime_type, &data[34+mdpr->stream_name_size], mdpr->mime_type_size);
   mdpr->mime_type[(int)mdpr->mime_type_size]=0;
 
   mdpr->type_specific_len=_X_BE_32(&data[34+mdpr->stream_name_size+mdpr->mime_type_size]);
-  mdpr->type_specific_data=malloc(sizeof(char)*(mdpr->type_specific_len));
+  mdpr->type_specific_data=calloc(mdpr->type_specific_len, sizeof(char));
   memcpy(mdpr->type_specific_data,
       &data[38+mdpr->stream_name_size+mdpr->mime_type_size], mdpr->type_specific_len);
 
@@ -820,8 +820,8 @@ static int demux_real_parse_references( demux_real_t *this) {
     if( !strncmp(&buf[i],"-->",3) )
       comment = 0;
       
-    if( (!strncmp(&buf[i],"pnm://",6) || !strncmp(&buf[i],"rtsp://",7)) &&
-        !comment ) {
+    if( (!strncmp(&buf[i],"pnm://",6) || !strncmp(&buf[i],"rtsp://",7) ||
+         !strncmp(&buf[i],"http://",7)) && !comment ) {
       for(j=i; buf[j] && buf[j] != '"' && !isspace(buf[j]); j++ )
         ;
       buf[j]='\0';
@@ -1529,7 +1529,8 @@ static int real_check_stream_type(uint8_t *buf, int len)
     return 1;
 
   buf[len] = '\0';
-  if( strstr(buf,"pnm://") || strstr(buf,"rtsp://") || strstr(buf,"<smil>") )
+  if( strstr(buf,"pnm://") || strstr(buf,"rtsp://") || strstr(buf,"<smil>") ||
+      strstr(buf,"http://") )
     return 2;
 
   return 0;
diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c
index 218046cf5..d5f7bb9b5 100644
--- a/src/demuxers/ebml.c
+++ b/src/demuxers/ebml.c
@@ -41,20 +41,10 @@
 ebml_parser_t *new_ebml_parser (xine_t *xine, input_plugin_t *input) {
   ebml_parser_t *ebml;
   
-  ebml = malloc(sizeof(ebml_parser_t));
+  ebml = xine_xmalloc(sizeof(ebml_parser_t));
   ebml->xine                 = xine;
   ebml->input                = input;
 
-  ebml->version              = 0;
-  ebml->read_version         = 0;
-  ebml->max_id_len           = 0;
-  ebml->max_size_len         = 0;
-  ebml->doctype              = NULL;
-  ebml->doctype_version      = 0;
-  ebml->doctype_read_version = 0;
-  
-  ebml->level                = 0;
-  
   return ebml;
 }
 
@@ -325,34 +315,31 @@ int ebml_read_date (ebml_parser_t *ebml, ebml_elem_t *elem, int64_t *date) {
 int ebml_read_master (ebml_parser_t *ebml, ebml_elem_t *elem) {
   ebml_elem_t *top_elem;
 
-  if (ebml->level >= 0) {
-    top_elem = &ebml->elem_stack[ebml->level];
-    top_elem->start = elem->start;
-    top_elem->len = elem->len;
-    top_elem->id = elem->id;
-  
-    ebml->level++;
-    lprintf("id: 0x%x, len: %" PRIu64 ", level: %d\n", elem->id, elem->len, ebml->level);
-    if (ebml->level >= EBML_STACK_SIZE) {
-      xprintf(ebml->xine, XINE_VERBOSITY_LOG,
-              "ebml: max level exceeded\n");
-      return 0;
-    }
-    return 1;
-  } else {
+  if (ebml->level < 0) {
     xprintf(ebml->xine, XINE_VERBOSITY_LOG,
             "ebml: invalid current level\n");
     return 0;
   }
-}
 
-int ebml_read_binary(ebml_parser_t *ebml, ebml_elem_t *elem, void *binary) {
-  if (!ebml_read_elem_data(ebml, binary, elem->len))
+  top_elem = &ebml->elem_stack[ebml->level];
+  top_elem->start = elem->start;
+  top_elem->len = elem->len;
+  top_elem->id = elem->id;
+  
+  ebml->level++;
+  lprintf("id: 0x%x, len: %" PRIu64 ", level: %d\n", elem->id, elem->len, ebml->level);
+  if (ebml->level >= EBML_STACK_SIZE) {
+    xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+	    "ebml: max level exceeded\n");
     return 0;
-
+  }
   return 1;
 }
 
+int ebml_read_binary(ebml_parser_t *ebml, ebml_elem_t *elem, void *binary) {
+  return !!ebml_read_elem_data(ebml, binary, elem->len);
+}
+
 int ebml_check_header(ebml_parser_t *ebml) {
   uint32_t next_level;
   ebml_elem_t master;
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index 78bf4012b..d3832c36d 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -42,7 +42,7 @@ static const demuxer_info_t demux_info_ac3 = {
 };
 
 static const demuxer_info_t demux_info_aud = {
-  10                      /* priority */
+  -2                      /* priority */
 };
 
 static const demuxer_info_t demux_info_aiff = {
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index 4149c0512..ceb66014f 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -273,15 +273,9 @@ static int id3v22_parse_frame_header(input_plugin_t *input,
 static int id3v22_interp_frame(input_plugin_t *input,
                                xine_stream_t *stream,
                                id3v22_frame_header_t *frame_header) {
-  char *buf;
+  char buf[frame_header->size + 1];
   int enc;
   
-  buf = malloc(frame_header->size + 1);
-  if (buf == NULL) {
-    lprintf("malloc error");
-    return 0;
-  }
-
   if (input->read (input, buf, frame_header->size) == frame_header->size) {
     buf[frame_header->size] = 0;
     enc = buf[0];
@@ -327,11 +321,9 @@ static int id3v22_interp_frame(input_plugin_t *input,
         lprintf("unhandled frame\n");
     }
 
-    free(buf);
     return 1;
   } else {
     lprintf("read error\n");
-    free(buf);
     return 0;
   }
 }
@@ -467,15 +459,9 @@ static int id3v23_parse_frame_ext_header(input_plugin_t *input,
 static int id3v23_interp_frame(input_plugin_t *input,
                                xine_stream_t *stream,
                                id3v23_frame_header_t *frame_header) {
-  char *buf;
+  char buf[frame_header->size + 1];
   int enc;
 
-  buf = malloc(frame_header->size + 1);
-  if (buf == NULL) {
-    lprintf("malloc error");
-    return 0;
-  }
-
   if (input->read (input, buf, frame_header->size) == frame_header->size) {
     buf[frame_header->size] = 0;
     enc = buf[0];
@@ -521,11 +507,9 @@ static int id3v23_interp_frame(input_plugin_t *input,
         lprintf("unhandled frame\n");
     }
 
-    free(buf);
     return 1;
   } else {
     lprintf("read error\n");
-    free(buf);
     return 0;
   }
 }
@@ -716,15 +700,9 @@ static int id3v24_parse_ext_header(input_plugin_t *input,
 static int id3v24_interp_frame(input_plugin_t *input,
                                xine_stream_t *stream,
                                id3v24_frame_header_t *frame_header) {
-  char *buf;
+  char buf[frame_header->size + 1];
   int enc;
 
-  buf = malloc(frame_header->size + 1);
-  if (buf == NULL) {
-    lprintf("malloc error");
-    return 0;
-  }
-
   if (input->read (input, buf, frame_header->size) == frame_header->size) {
     buf[frame_header->size] = 0;
     enc = buf[0];
@@ -772,11 +750,9 @@ static int id3v24_interp_frame(input_plugin_t *input,
         lprintf("unhandled frame\n");
     }
 
-    free(buf);
     return 1;
   } else {
     lprintf("read error\n");
-    free(buf);
     return 0;
   }
 }
diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index 4883763b0..279d3ff05 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -240,8 +240,7 @@ char *_x_canonicalise_url (const char *base, const char *url) {
       ++cut;
   }
   base_length = cut ? (size_t)(cut - base) : strlen (base);
-  ret = malloc (base_length + strlen (url) + 1);
-  sprintf (ret, "%.*s%s", (int)base_length, base, url);
+  asprintf (&ret, "%.*s%s", (int)base_length, base, url);
   return ret;
 }
 
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index a1e0b473e..f89697981 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -424,10 +424,9 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
   toc->total_tracks = toc->last_track - toc->first_track + 1;
   
   /* allocate space for the toc entries */
-  toc->toc_entries =
-    (cdrom_toc_entry *)malloc(toc->total_tracks * sizeof(cdrom_toc_entry));
+  toc->toc_entries = calloc(toc->total_tracks, sizeof(cdrom_toc_entry));
   if (!toc->toc_entries) {
-    perror("malloc");
+    perror("calloc");
     return -1;
   }
 
@@ -535,10 +534,9 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
   toc->total_tracks = toc->last_track - toc->first_track + 1;
 
   /* allocate space for the toc entries */
-  toc->toc_entries =
-    (cdrom_toc_entry *)malloc(toc->total_tracks * sizeof(cdrom_toc_entry));
+  toc->toc_entries = calloc(toc->total_tracks, sizeof(cdrom_toc_entry));
   if (!toc->toc_entries) {
-    perror("malloc");
+    perror("calloc");
     return -1;
   }
 
@@ -648,10 +646,9 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
   toc->total_tracks = toc->last_track - toc->first_track + 1;
 
   /* allocate space for the toc entries */
-  toc->toc_entries =
-    (cdrom_toc_entry *)malloc(toc->total_tracks * sizeof(cdrom_toc_entry));
+  toc->toc_entries = calloc(toc->total_tracks, sizeof(cdrom_toc_entry));
   if (!toc->toc_entries) {
-    perror("malloc");
+    perror("calloc");
     return -1;
   }
 
@@ -841,10 +838,9 @@ static int read_cdrom_toc(cdda_input_plugin_t *this_gen, cdrom_toc *toc) {
 
      
       /* allocate space for the toc entries */
-      toc->toc_entries =
-          (cdrom_toc_entry *)malloc(toc->total_tracks * sizeof(cdrom_toc_entry));
+      toc->toc_entries = calloc(toc->total_tracks, sizeof(cdrom_toc_entry));
       if (!toc->toc_entries) {
-          perror("malloc");
+          perror("calloc");
           return -1;
       }
   
@@ -1087,10 +1083,9 @@ static int network_read_cdrom_toc(xine_stream_t *stream, int fd, cdrom_toc *toc)
   toc->total_tracks = toc->last_track - toc->first_track + 1;
 
   /* allocate space for the toc entries */
-  toc->toc_entries =
-    (cdrom_toc_entry *)malloc(toc->total_tracks * sizeof(cdrom_toc_entry));
+  toc->toc_entries = calloc(toc->total_tracks, sizeof(cdrom_toc_entry));
   if (!toc->toc_entries) {
-    perror("malloc");
+    perror("calloc");
     return -1;
   }
 
@@ -1290,42 +1285,29 @@ static void _cdda_mkdir_safe(xine_t *xine, char *path) {
 }
 
 /*
- * Make recursive directory creation
+ * Make recursive directory creation (given an absolute pathname)
  */
-static void _cdda_mkdir_recursive_safe(xine_t *xine, char *path) {
-  char *p, *pp;
-  char buf[XINE_PATH_MAX + XINE_NAME_MAX + 1];
-  char buf2[XINE_PATH_MAX + XINE_NAME_MAX + 1];
-
-  if(path == NULL)
+static void _cdda_mkdir_recursive_safe (xine_t *xine, char *path)
+{
+  if (!path)
     return;
 
-  memset(&buf, 0, sizeof(buf));
-  memset(&buf2, 0, sizeof(buf2));
+  char buf[strlen (path) + 1];
+  strcpy (buf, path);
+  char *p = strchr (buf, '/') ? : buf;
 
-  snprintf(buf, sizeof(buf), "%s", path);
-  pp = buf;
-  while((p = xine_strsep(&pp, "/")) != NULL) {
-    if(p && strlen(p)) {
-
-#ifdef WIN32
-		if (*buf2 != '\0') {
-#endif
-
-      int size = strlen(buf2);
-      snprintf(buf2 + size, sizeof(buf2) - size, "/%s", p);
-
-#ifdef WIN32
-		}
-		else {
-          snprintf(buf2, sizeof(buf2), "%s", p);
-		}
-
-#endif /* WIN32 */
+  do
+  {
+    while (*p++ == '/') /**/;
+    p = strchr (p, '/');
+    if (p)
+      *p = 0;
+    _cdda_mkdir_safe (xine, buf);
+    if (p)
+      *p = '/';
+  } while (p);
 
-      _cdda_mkdir_safe(xine, buf2);
-    }
-  }
+  return 0;
 }
 
 /*
@@ -1445,7 +1427,6 @@ static int _cdda_load_cached_cddb_infos(cdda_input_plugin_t *this) {
     while((pdir = readdir(dir)) != NULL) {
       char discid[9];
       
-      memset(&discid, 0, sizeof(discid));
       snprintf(discid, sizeof(discid), "%08lx", this->cddb.disc_id);
      
       if(!strcasecmp(pdir->d_name, discid)) {
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 446b7c778..8656097bc 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1374,10 +1374,7 @@ check_solaris_vold_device(dvd_input_class_t *this)
       (volume_action = getenv("VOLUME_ACTION")) != NULL &&
       strcmp(volume_action, "insert") == 0) {
 
-    device = malloc(strlen(volume_device) + strlen(volume_name) + 2);
-    if (device == NULL)
-      return;
-    sprintf(device, "%s/%s", volume_device, volume_name);
+    asprintf(&device, "%s/%s", volume_device, volume_name);
     if (stat(device, &stb) != 0 || !S_ISCHR(stb.st_mode)) {
       free(device);
       return;
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 1916a71e4..1556afb09 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -337,7 +337,7 @@ static int file_plugin_open (input_plugin_t *this_gen ) {
 
   lprintf("file_plugin_open\n");
 
-  if (strncasecmp (this->mrl, "file:", 5) == 0)
+  if (strncasecmp (this->mrl, "file:/", 6) == 0)
   {
     if (strncasecmp (this->mrl, "file://localhost/", 16) == 0)
       filename = decode_uri(&(this->mrl[16]));
@@ -347,43 +347,27 @@ static int file_plugin_open (input_plugin_t *this_gen ) {
       filename = decode_uri(&(this->mrl[5]));
   }
   else
-    filename = decode_uri(this->mrl);
+    filename = strdup(this->mrl); /* NEVER unescape plain file names! */
 
   this->fh = open (filename, O_RDONLY|O_BINARY);
-  
-  free(filename);
 
   if (this->fh == -1) {
-    /* try again without unescaping; such MRLs might be invalid,
-     * but we are a nice software */
-    if (strncasecmp (this->mrl, "file:", 5) == 0)
-    {
-      if (strncasecmp (this->mrl, "file://localhost/", 16) == 0)
-        this->fh = open(&this->mrl[16], O_RDONLY|O_BINARY);
-      else if (strncasecmp (this->mrl, "file://127.0.0.1/", 16) == 0)
-        this->fh = open(&this->mrl[16], O_RDONLY|O_BINARY);
-      else
-        this->fh = open(&this->mrl[5], O_RDONLY|O_BINARY);
+    if (errno == EACCES) {
+      _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
+      xine_log (this->stream->xine, XINE_LOG_MSG,
+                _("input_file: Permission denied: >%s<\n"), this->mrl);
+    } else if (errno == ENOENT) {
+      _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, NULL);
+      xine_log (this->stream->xine, XINE_LOG_MSG,
+                _("input_file: File not found: >%s<\n"), this->mrl);
     }
-    else
-      this->fh = open(this->mrl, O_RDONLY|O_BINARY);
-
-    if (this->fh == -1) {
-      if (errno == EACCES) {
-        _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
-	xine_log (this->stream->xine, XINE_LOG_MSG,
-		  _("input_file: Permission denied: >%s<\n"), this->mrl);
-	return -1;
-      } else if (errno == ENOENT) {
-        _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, NULL);
-	xine_log (this->stream->xine, XINE_LOG_MSG,
-		  _("input_file: File not found: >%s<\n"), this->mrl);
-      }
 
-      return -1;
-    }
+    free(filename);
+    return -1;
   }
 
+  free(filename);
+
 #ifdef HAVE_MMAP
   this->mmap_on = 0;
   this->mmap_base = NULL;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 38658b161..f2e91c226 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -79,9 +79,6 @@ typedef struct {
   char             buf[BUFSIZE];
   char             proxybuf[BUFSIZE];
 
-  char             auth[BUFSIZE];
-  char             proxyauth[BUFSIZE];
-  
   char             preview[MAX_PREVIEW_SIZE];
   off_t            preview_size;
 
@@ -232,7 +229,7 @@ static int _x_use_proxy(http_input_class_t *this, const char *host) {
 }
 
 static int http_plugin_basicauth (const char *user, const char *password, char* dest, int len) {
-  static char *enctable="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+  static const char enctable[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
   char        *tmp;
   char        *sptr;
   char        *dptr;
@@ -249,7 +246,7 @@ static int http_plugin_basicauth (const char *user, const char *password, char*
   if (len < enclen)
     return -1;
   
-  tmp = malloc (sizeof(char) * (totlen + 1));
+  tmp = malloc (totlen + 1);
   strcpy (tmp, user);
   strcat (tmp, ":");
   if (password != NULL)
@@ -667,6 +664,8 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
   int                  use_proxy;
   int                  proxyport;
   int                  mpegurl_redirect = 0;
+  char                 auth[BUFSIZE];
+  char                 proxyauth[BUFSIZE];
   
   use_proxy = this_class->proxyhost && strlen(this_class->proxyhost);
   
@@ -674,7 +673,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
     if (this_class->proxyuser && strlen(this_class->proxyuser)) {
       if (http_plugin_basicauth (this_class->proxyuser,
 			         this_class->proxypassword,
-				 this->proxyauth, BUFSIZE)) {
+				 proxyauth, BUFSIZE)) {
 	_x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", NULL);
 	return 0;
       }
@@ -693,7 +692,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
     this->port = DEFAULT_HTTP_PORT;
   
   if (this->user && strlen(this->user)) {
-    if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
+    if (http_plugin_basicauth (this->user, this->password, auth, BUFSIZE)) {
       _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL);
       return -1;
     }
@@ -776,12 +775,12 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
   buflen = strlen(this->buf);
   if (this_class->proxyuser && strlen(this_class->proxyuser)) {
     snprintf (this->buf + buflen, BUFSIZE - buflen,
-              "Proxy-Authorization: Basic %s\015\012", this->proxyauth);
+              "Proxy-Authorization: Basic %s\015\012", proxyauth);
     buflen = strlen(this->buf);
   }
   if (this->user && strlen(this->user)) {
     snprintf (this->buf + buflen, BUFSIZE - buflen,
-              "Authorization: Basic %s\015\012", this->auth);
+              "Authorization: Basic %s\015\012", auth);
     buflen = strlen(this->buf);
   }
   
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index ac7c5f2f0..40bb9dc79 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -511,10 +511,7 @@ static char *make_temp_name(pvr_input_plugin_t *this, int page) {
 
   char *filename;
   
-  int size = strlen(this->tmp_prefix)+PVR_FILENAME_SIZE;
-  filename = malloc(size);
-      
-  snprintf(filename, size, PVR_FILENAME, this->tmp_prefix, this->session, page);
+  asprintf(&filename, PVR_FILENAME, this->tmp_prefix, this->session, page);
   
   return filename;
 }
@@ -527,12 +524,9 @@ static char *make_base_save_name(int channel, time_t tm) {
   struct tm rec_time;
   char *filename;
   
-  int size = SAVE_BASE_FILENAME_SIZE;
-  filename = malloc(size);
-  
   localtime_r(&tm, &rec_time);
       
-  snprintf(filename, size, SAVE_BASE_FILENAME, 
+  asprintf(&filename, SAVE_BASE_FILENAME, 
            channel, rec_time.tm_mon+1, rec_time.tm_mday,
            rec_time.tm_year+1900, rec_time.tm_hour, rec_time.tm_min,
            rec_time.tm_sec);
@@ -546,10 +540,7 @@ static char *make_save_name(pvr_input_plugin_t *this, char *base, int page) {
 
   char *filename;
   
-  int size = strlen(this->save_prefix)+strlen(base)+SAVE_FILENAME_SIZE;
-  filename = malloc(size);
-      
-  snprintf(filename, size, SAVE_FILENAME, this->save_prefix, base, page);
+  asprintf(&filename, SAVE_FILENAME, this->save_prefix, base, page);
   
   return filename;
 }
diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index 9ea65d9df..925b0fdf8 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -660,7 +660,7 @@ rmff_header_t  *real_setup_and_get_header(rtsp_t *rtsp_session, uint32_t bandwid
     
   lprintf("Stream description size: %i\n", size);
 
-  description = malloc(sizeof(char)*(size+1));
+  description = calloc(size+1, sizeof(char));
 
   if( rtsp_read_data(rtsp_session, description, size) <= 0) {
     xine_buffer_free(buf);
diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index e942fe4cc..4fea74636 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -311,17 +311,17 @@ static rmff_mdpr_t *rmff_scan_mdpr(const char *data) {
   mdpr->duration=_X_BE_32(&data[36]);
   
   mdpr->stream_name_size=data[40];
-  mdpr->stream_name = malloc(sizeof(char)*(mdpr->stream_name_size+1));
+  mdpr->stream_name = calloc(mdpr->stream_name_size+1, sizeof(char));
   memcpy(mdpr->stream_name, &data[41], mdpr->stream_name_size);
   mdpr->stream_name[mdpr->stream_name_size]=0;
   
   mdpr->mime_type_size=data[41+mdpr->stream_name_size];
-  mdpr->mime_type = malloc(sizeof(char)*(mdpr->mime_type_size+1));
+  mdpr->mime_type = calloc(mdpr->mime_type_size+1, sizeof(char));
   memcpy(mdpr->mime_type, &data[42+mdpr->stream_name_size], mdpr->mime_type_size);
   mdpr->mime_type[mdpr->mime_type_size]=0;
   
   mdpr->type_specific_len=_X_BE_32(&data[42+mdpr->stream_name_size+mdpr->mime_type_size]);
-  mdpr->type_specific_data = malloc(sizeof(char)*(mdpr->type_specific_len));
+  mdpr->type_specific_data = calloc(mdpr->type_specific_len, sizeof(char));
   memcpy(mdpr->type_specific_data, 
       &data[46+mdpr->stream_name_size+mdpr->mime_type_size], mdpr->type_specific_len);
   
@@ -341,22 +341,22 @@ static rmff_cont_t *rmff_scan_cont(const char *data) {
     lprintf("warning: unknown object version in CONT: 0x%04x\n", cont->object_version);
   }
   cont->title_len=_X_BE_16(&data[10]);
-  cont->title = malloc(sizeof(char)*(cont->title_len+1));
+  cont->title = calloc((cont->title_len+1), sizeof(char));
   memcpy(cont->title, &data[12], cont->title_len);
   cont->title[cont->title_len]=0;
   pos=cont->title_len+12;
   cont->author_len=_X_BE_16(&data[pos]);
-  cont->author = malloc(sizeof(char)*(cont->author_len+1));
+  cont->author = calloc(cont->author_len+1, sizeof(char));
   memcpy(cont->author, &data[pos+2], cont->author_len);
   cont->author[cont->author_len]=0;
   pos=pos+2+cont->author_len;
   cont->copyright_len=_X_BE_16(&data[pos]);
-  cont->copyright = malloc(sizeof(char)*(cont->copyright_len+1));
+  cont->copyright = calloc(cont->copyright_len+1, sizeof(char));
   memcpy(cont->copyright, &data[pos+2], cont->copyright_len);
   cont->copyright[cont->copyright_len]=0;
   pos=pos+2+cont->copyright_len;
   cont->comment_len=_X_BE_16(&data[pos]);
-  cont->comment = malloc(sizeof(char)*(cont->comment_len+1));
+  cont->comment = calloc(cont->comment_len+1, sizeof(char));
   memcpy(cont->comment, &data[pos+2], cont->comment_len);
   cont->comment[cont->comment_len]=0;
 
@@ -404,10 +404,7 @@ rmff_header_t *rmff_scan_header(const char *data) {
   header->fileheader=rmff_scan_fileheader(ptr);
   ptr += header->fileheader->size;
 	
-  header->streams = malloc(sizeof(rmff_mdpr_t*)*(header->fileheader->num_headers));
-  for (i=0; i<header->fileheader->num_headers; i++) {
-    header->streams[i]=NULL;
-  }
+  header->streams = calloc(header->fileheader->num_headers, sizeof(rmff_mdpr_t*));
   
   for (i=1; i<header->fileheader->num_headers; i++) {
     chunk_type = _X_BE_32(ptr);
@@ -587,7 +584,7 @@ rmff_mdpr_t *rmff_new_mdpr(
     mdpr->mime_type_size=strlen(mime_type);
   }
   mdpr->type_specific_len=type_specific_len;
-  mdpr->type_specific_data = malloc(sizeof(char)*type_specific_len);
+  mdpr->type_specific_data = calloc(type_specific_len, sizeof(char));
   memcpy(mdpr->type_specific_data,type_specific_data,type_specific_len);
   mdpr->mlti_data=NULL;
   
diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c
index 3bc5af608..ad65bd491 100644
--- a/src/input/libreal/sdpplin.c
+++ b/src/input/libreal/sdpplin.c
@@ -236,7 +236,7 @@ sdpplin_t *sdpplin_parse(char *data) {
     
     if(filter(data,"a=StreamCount:integer;",&buf)) {
       desc->stream_count=atoi(buf);
-      desc->stream = malloc(sizeof(sdpplin_stream_t*)*desc->stream_count);
+      desc->stream = calloc(desc->stream_count, sizeof(sdpplin_stream_t*));
       handled=1;
       data=nl(data);
     }
diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index a44d0e8e1..d0f09d563 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.c
@@ -21,6 +21,8 @@
  * *not* RFC 2326 compilant yet.
  */
 
+#include <config.h>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
@@ -103,8 +105,7 @@ const char rtsp_protocol_version[]="RTSP/1.0";
  */
  
 static char *rtsp_get(rtsp_t *s) {
-
-  char *buffer = malloc(BUF_SIZE);
+  char buffer[BUF_SIZE];
   char *string = NULL;
     
   if ( _x_io_tcp_read_line(s->stream, s->s, buffer, BUF_SIZE) >= 0 ) {
@@ -112,7 +113,6 @@ static char *rtsp_get(rtsp_t *s) {
     string = strdup( buffer );
   }
   
-  free(buffer);
   return string;
 }
 
@@ -124,7 +124,7 @@ static char *rtsp_get(rtsp_t *s) {
 static void rtsp_put(rtsp_t *s, const char *string) {
 
   int len=strlen(string);
-  char *buf = malloc(sizeof(char)*len+2);
+  char buf[len+2];
 
   lprintf(">> '%s'", string);
 
@@ -135,8 +135,6 @@ static void rtsp_put(rtsp_t *s, const char *string) {
   _x_io_tcp_write(s->stream, s->s, buf, len+2);
   
   lprintf("done.\n");
-
-  free(buf);
 }
 
 /*
@@ -171,13 +169,11 @@ static int rtsp_get_code(rtsp_t *s, const char *string) {
 static void rtsp_send_request(rtsp_t *s, const char *type, const char *what) {
 
   char **payload=s->scheduled;
-  char *buf;
-  
-  buf = malloc(strlen(type)+strlen(what)+strlen(rtsp_protocol_version)+3);
+  char buf[strlen(type)+strlen(what)+strlen(rtsp_protocol_version)+3];
   
   sprintf(buf,"%s %s %s",type, what, rtsp_protocol_version);
   rtsp_put(s,buf);
-  free(buf);
+
   if (payload)
     while (*payload) {
       rtsp_put(s,*payload);
@@ -199,11 +195,9 @@ static void rtsp_schedule_standard(rtsp_t *s) {
   rtsp_schedule_field(s, tmp);
   
   if (s->session) {
-    char *buf;
-    buf = malloc(strlen(s->session)+15);
+    char buf[strlen(s->session)+15];
     sprintf(buf, "Session: %s", s->session);
     rtsp_schedule_field(s, buf);
-    free(buf);
   }
 }
 /*
@@ -241,14 +235,13 @@ static int rtsp_get_answers(rtsp_t *s) {
       }
     }
     if (!strncasecmp(answer,"Server:",7)) {
-      char *buf = xine_xmalloc(strlen(answer));
+      char buf[strlen(answer)];
       sscanf(answer,"%*s %s",buf);
       if (s->server) free(s->server);
       s->server=strdup(buf);
-      free(buf);
     }
     if (!strncasecmp(answer,"Session:",8)) {
-      char *buf = xine_xmalloc(strlen(answer));
+      char buf[strlen(answer)];
       sscanf(answer,"%*s %s",buf);
       if (s->session) {
         if (strcmp(buf, s->session)) {
@@ -263,7 +256,6 @@ static int rtsp_get_answers(rtsp_t *s) {
 
         s->session=strdup(buf);
       }
-      free(buf);
     }
     *answer_ptr=answer;
     answer_ptr++;
@@ -304,8 +296,7 @@ int rtsp_request_options(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    buf = malloc(sizeof(char)*(strlen(s->host)+16));
-    sprintf(buf,"rtsp://%s:%i", s->host, s->port);
+    asprintf(&buf,"rtsp://%s:%i", s->host, s->port);
   }
   rtsp_send_request(s,"OPTIONS",buf);
   free(buf);
@@ -321,8 +312,7 @@ int rtsp_request_describe(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    buf = malloc(sizeof(char)*(strlen(s->host)+strlen(s->path)+16));
-    sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
+    asprintf(&buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
   }
   rtsp_send_request(s,"DESCRIBE",buf);
   free(buf);
@@ -345,8 +335,7 @@ int rtsp_request_setparameter(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    buf = malloc(sizeof(char)*(strlen(s->host)+strlen(s->path)+16));
-    sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
+    asprintf(&buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
   }
   rtsp_send_request(s,"SET_PARAMETER",buf);
   free(buf);
@@ -362,8 +351,7 @@ int rtsp_request_play(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    buf = malloc(sizeof(char)*(strlen(s->host)+strlen(s->path)+16));
-    sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
+    asprintf(&buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
   }
   rtsp_send_request(s,"PLAY",buf);
   free(buf);
@@ -412,8 +400,7 @@ int rtsp_read_data(rtsp_t *s, void *buffer_gen, unsigned int size) {
       }
       /* lets make the server happy */
       rtsp_put(s, "RTSP/1.0 451 Parameter Not Understood");
-      rest = malloc(sizeof(char)*17);
-      sprintf(rest,"CSeq: %u", seq);
+      asprintf(&rest,"CSeq: %u", seq);
       rtsp_put(s, rest);
       free(rest);
       rtsp_put(s, "");
@@ -486,9 +473,7 @@ rtsp_t *rtsp_connect(xine_stream_t *stream, const char *mrl, const char *user_ag
   pathbegin=slash-mrl_ptr;
   hostend=colon-mrl_ptr;
 
-  s->host = malloc(sizeof(char)*hostend+1);
-  strncpy(s->host, mrl_ptr, hostend);
-  s->host[hostend]=0;
+  s->host = strndup(mrl_ptr, hostend);
 
   if (pathbegin < strlen(mrl_ptr)) s->path=strdup(mrl_ptr+pathbegin+1);
   if (colon != slash) {
diff --git a/src/input/pnm.c b/src/input/pnm.c
index 38d65b850..942e52957 100644
--- a/src/input/pnm.c
+++ b/src/input/pnm.c
@@ -21,6 +21,8 @@
  * based upon code from joschka
  */
 
+#include <config.h>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/socket.h>
@@ -732,9 +734,7 @@ pnm_t *pnm_connect(xine_stream_t *stream, const char *mrl) {
   pathbegin=slash-mrl_ptr;
   hostend=colon-mrl_ptr;
 
-  p->host = malloc(sizeof(char)*hostend+1);
-  strncpy(p->host, mrl_ptr, hostend);
-  p->host[hostend]=0;
+  p->host = strndup(mrl_ptr, hostend);
 
   if (pathbegin < strlen(mrl_ptr)) p->path=strdup(mrl_ptr+pathbegin+1);
   if (colon != slash) {
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 45d9789ba..b794331f1 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -272,11 +272,9 @@ vcd_add_mrl_slot(vcd_input_class_t *this, const char *mrl, off_t size,
   this->mrls[*i]->type   = mrl_vcd;
   this->mrls[*i]->size   = size * M2F2_SECTOR_SIZE;
   
-  this->mrls[*i]->mrl = (char *) malloc(strlen(mrl) + 1);
+  this->mrls[*i]->mrl = strdup(mrl);
   if (NULL==this->mrls[*i]->mrl) {
-    LOG_ERR("Can't malloc %zu bytes for MRL name %s", sizeof(xine_mrl_t), mrl);
-  } else {
-    sprintf(this->mrls[*i]->mrl, "%s", mrl);
+    LOG_ERR("Can't strndup %zu bytes for MRL name %s", strlen(mrl), mrl);
   }
   (*i)++;
 }
diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c
index ccfd641aa..5683002f6 100644
--- a/src/post/mosaico/mosaico.c
+++ b/src/post/mosaico/mosaico.c
@@ -96,7 +96,6 @@ struct post_mosaico_s {
 static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           mosaico_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           mosaico_dispose(post_plugin_t *this_gen);
@@ -128,7 +127,7 @@ static void *mosaico_init_plugin(xine_t *xine, void *data)
   this->class.open_plugin     = mosaico_open_plugin;
   this->class.identifier      = "mosaico";
   this->class.description     = N_("Mosaico is a picture in picture (pip) post plugin");
-  this->class.dispose         = mosaico_class_dispose;
+  this->class.dispose         = default_post_class_dispose;
   this->xine                  = xine;
 
   return &this->class;
@@ -200,12 +199,6 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void mosaico_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void mosaico_dispose(post_plugin_t *this_gen)
 {
   post_mosaico_t *this = (post_mosaico_t *)this_gen;
diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c
index 19e563680..23469e566 100644
--- a/src/post/mosaico/switch.c
+++ b/src/post/mosaico/switch.c
@@ -82,7 +82,6 @@ struct post_switch_s {
 static post_plugin_t *switch_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           switch_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           switch_dispose(post_plugin_t *this_gen);
@@ -107,7 +106,7 @@ static void *switch_init_plugin(xine_t *xine, void *data)
   this->class.open_plugin     = switch_open_plugin;
   this->class.identifier      = "switch";
   this->class.description     = N_("Switch is a post plugin able to switch at any time between different streams");
-  this->class.dispose         = switch_class_dispose;
+  this->class.dispose         = default_post_class_dispose;
   this->xine                  = xine;
 
   return &this->class;
@@ -166,12 +165,6 @@ static post_plugin_t *switch_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void switch_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void switch_dispose(post_plugin_t *this_gen)
 {
   post_switch_t *this = (post_switch_t *)this_gen;
diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index 66af08e5c..225e75954 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -120,7 +120,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           boxblur_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           boxblur_dispose(post_plugin_t *this_gen);
@@ -134,7 +133,7 @@ static int            boxblur_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *boxblur_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
   if (!class)
     return NULL;
@@ -142,7 +141,7 @@ void *boxblur_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = boxblur_open_plugin;
   class->identifier      = "boxblur";
   class->description     = N_("box blur filter from mplayer");
-  class->dispose         = boxblur_class_dispose;
+  class->dispose         = default_post_class_dispose;
 
   return class;
 }
@@ -192,12 +191,6 @@ static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void boxblur_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void boxblur_dispose(post_plugin_t *this_gen)
 {
   post_plugin_boxblur_t *this = (post_plugin_boxblur_t *)this_gen;
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index 647ab075e..fb7021ece 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.c
@@ -157,7 +157,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *denoise3d_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           denoise3d_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           denoise3d_dispose(post_plugin_t *this_gen);
@@ -174,7 +173,7 @@ static int            denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *denoise3d_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
   if (!class)
     return NULL;
@@ -182,7 +181,7 @@ void *denoise3d_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = denoise3d_open_plugin;
   class->identifier      = "denoise3d";
   class->description     = N_("3D Denoiser (variable lowpass filter)");
-  class->dispose         = denoise3d_class_dispose;
+  class->dispose         = default_post_class_dispose;
 
   return class;
 }
@@ -235,12 +234,6 @@ static post_plugin_t *denoise3d_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void denoise3d_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void denoise3d_dispose(post_plugin_t *this_gen)
 {
   post_plugin_denoise3d_t *this = (post_plugin_denoise3d_t *)this_gen;
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index cb28cafa2..03f647d68 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.c
@@ -208,7 +208,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *eq_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           eq_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           eq_dispose(post_plugin_t *this_gen);
@@ -226,7 +225,7 @@ static int            eq_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *eq_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
   if (!class)
     return NULL;
@@ -234,7 +233,7 @@ void *eq_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = eq_open_plugin;
   class->identifier      = "eq";
   class->description     = N_("soft video equalizer");
-  class->dispose         = eq_class_dispose;
+  class->dispose         = default_post_class_dispose;
 
   return class;
 }
@@ -290,12 +289,6 @@ static post_plugin_t *eq_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void eq_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void eq_dispose(post_plugin_t *this_gen)
 {
   post_plugin_eq_t *this = (post_plugin_eq_t *)this_gen;
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index 277aca00e..ceb9f9024 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.c
@@ -389,7 +389,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           eq2_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           eq2_dispose(post_plugin_t *this_gen);
@@ -407,7 +406,7 @@ static int            eq2_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *eq2_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
   if (!class)
     return NULL;
@@ -415,7 +414,7 @@ void *eq2_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = eq2_open_plugin;
   class->identifier      = "eq2";
   class->description     = N_("Software video equalizer");
-  class->dispose         = eq2_class_dispose;
+  class->dispose         = default_post_class_dispose;
 
   return class;
 }
@@ -487,12 +486,6 @@ static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void eq2_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void eq2_dispose(post_plugin_t *this_gen)
 {
   post_plugin_eq2_t *this = (post_plugin_eq2_t *)this_gen;
diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c
index df5fa874e..db62a5512 100644
--- a/src/post/planar/expand.c
+++ b/src/post/planar/expand.c
@@ -100,7 +100,6 @@ typedef struct post_expand_s {
 static post_plugin_t *expand_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           expand_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           expand_dispose(post_plugin_t *this_gen);
@@ -128,7 +127,7 @@ static int32_t        expand_overlay_add_event(video_overlay_manager_t *this_gen
 
 void *expand_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
   
   if (!class)
     return NULL;
@@ -136,7 +135,7 @@ void *expand_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = expand_open_plugin;
   class->identifier      = "expand";
   class->description     = N_("add black borders to top and bottom of video to expand it to 4:3 aspect ratio");
-  class->dispose         = expand_class_dispose;
+  class->dispose         = default_post_class_dispose;
   
   return class;
 }
@@ -189,12 +188,6 @@ static post_plugin_t *expand_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void expand_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void expand_dispose(post_plugin_t *this_gen)
 {
   post_expand_t     *this = (post_expand_t *)this_gen;
diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c
index 14bd55102..62fdc1381 100644
--- a/src/post/planar/fill.c
+++ b/src/post/planar/fill.c
@@ -32,7 +32,6 @@ void *fill_init_plugin(xine_t *xine, void *);
 static post_plugin_t *fill_open_plugin(post_class_t *class_gen, int inputs,
                                        xine_audio_port_t **audio_target,
                                        xine_video_port_t **video_target);
-static void           fill_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           fill_dispose(post_plugin_t *this_gen);
@@ -46,7 +45,7 @@ static int            fill_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *fill_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
   
   if (!class)
     return NULL;
@@ -54,7 +53,7 @@ void *fill_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = fill_open_plugin;
   class->identifier      = "fill";
   class->description     = N_("crops left and right of video to fill 4:3 aspect ratio");
-  class->dispose         = fill_class_dispose;
+  class->dispose         = default_post_class_dispose;
   
   return class;
 }
@@ -90,11 +89,6 @@ static post_plugin_t *fill_open_plugin(post_class_t *class_gen, int inputs,
   return this;
 }
 
-static void fill_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 static void fill_dispose(post_plugin_t *this)
 {
   if (_x_post_dispose(this))
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index dd1d7ac07..b5ee1e3f2 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.c
@@ -33,7 +33,6 @@ void *invert_init_plugin(xine_t *xine, void *);
 static post_plugin_t *invert_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           invert_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           invert_dispose(post_plugin_t *this_gen);
@@ -47,7 +46,7 @@ static int            invert_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *invert_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
   
   if (!class)
     return NULL;
@@ -55,7 +54,7 @@ void *invert_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = invert_open_plugin;
   class->identifier      = "invert";
   class->description     = N_("inverts the colours of every video frame");
-  class->dispose         = invert_class_dispose;
+  class->dispose         = default_post_class_dispose;
   
   return class;
 }
@@ -89,12 +88,6 @@ static post_plugin_t *invert_open_plugin(post_class_t *class_gen, int inputs,
   return this;
 }
 
-static void invert_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void invert_dispose(post_plugin_t *this)
 {
   if (_x_post_dispose(this))
diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index 394b6a7b4..14c995f8b 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -428,7 +428,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *noise_open_plugin(post_class_t *class_gen, int inputs,
                      xine_audio_port_t **audio_target,
                      xine_video_port_t **video_target);
-static void           noise_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           noise_dispose(post_plugin_t *this_gen);
@@ -442,7 +441,7 @@ static int            noise_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *noise_init_plugin(xine_t *xine, void *data)
 {
-    post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+    post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
     if (!class)
         return NULL;
@@ -450,7 +449,7 @@ void *noise_init_plugin(xine_t *xine, void *data)
     class->open_plugin     = noise_open_plugin;
     class->identifier      = "noise";
     class->description     = N_("Adds noise");
-    class->dispose         = noise_class_dispose;
+    class->dispose         = default_post_class_dispose;
 
 #ifdef ARCH_X86
     if (xine_mm_accel() & MM_ACCEL_X86_MMX) {
@@ -512,12 +511,6 @@ static post_plugin_t *noise_open_plugin(post_class_t *class_gen, int inputs,
     return &this->post;
 }
 
-static void noise_class_dispose(post_class_t *class_gen)
-{
-    free(class_gen);
-}
-
-
 static void noise_dispose(post_plugin_t *this_gen)
 {
     post_plugin_noise_t *this = (post_plugin_noise_t *)this_gen;
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 22a25fc90..3f9c0d745 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -135,7 +135,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *pp_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           pp_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           pp_dispose(post_plugin_t *this_gen);
@@ -149,7 +148,7 @@ static int            pp_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *pp_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
   if (!class)
     return NULL;
@@ -157,7 +156,7 @@ void *pp_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = pp_open_plugin;
   class->identifier      = "pp";
   class->description     = N_("plugin for ffmpeg libpostprocess");
-  class->dispose         = pp_class_dispose;
+  class->dispose         = default_post_class_dispose;
 
   return class;
 }
@@ -219,12 +218,6 @@ static post_plugin_t *pp_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void pp_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void pp_dispose(post_plugin_t *this_gen)
 {
   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index b850b05b7..ff86f21bc 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.c
@@ -253,7 +253,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *unsharp_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           unsharp_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           unsharp_dispose(post_plugin_t *this_gen);
@@ -267,7 +266,7 @@ static int            unsharp_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *unsharp_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
   if (!class)
     return NULL;
@@ -275,7 +274,7 @@ void *unsharp_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = unsharp_open_plugin;
   class->identifier      = "unsharp";
   class->description     = N_("unsharp mask & gaussian blur");
-  class->dispose         = unsharp_class_dispose;
+  class->dispose         = default_post_class_dispose;
 
   return class;
 }
@@ -330,11 +329,6 @@ static post_plugin_t *unsharp_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void unsharp_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 static void unsharp_free_SC(post_plugin_unsharp_t *this)
 {
   int i;
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index 6f9f6381d..5010c60eb 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -464,7 +464,7 @@ int _x_demux_check_extension (const char *mrl, const char *extensions){
 
   while ( ( e = xine_strsep(&ext_work, " ")) != NULL ) {
     if ( strstr(e, ":/") ) {
-      if ( strcasecmp (mrl, e) == 0 ) {
+      if ( strncasecmp (mrl, e, strlen (e)) == 0 ) {
 	found = 1;
 	break;
       }
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 2d2f3f3e4..a03ea6d17 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -2533,7 +2533,7 @@ char *xine_get_mime_types (xine_t *self) {
 
       cls = (demux_class_t *)node->plugin_class;
 
-      if ( cls->mimetypes );
+      if ( cls->mimetypes )
 	len += strlen(cls->mimetypes);
     }
   }
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index 328d2cb3c..e9bd86836 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.c
@@ -176,7 +176,6 @@ static scr_plugin_t* unixscr_init () {
   unixscr_t *this;
 
   this = (unixscr_t *) xine_xmalloc(sizeof(unixscr_t));
-  memset(this, 0, sizeof(*this));
   
   this->scr.interface_version = 3;
   this->scr.get_priority      = unixscr_get_priority;
diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c
index 98fed2cdd..8f9021aa1 100644
--- a/src/xine-engine/scratch.c
+++ b/src/xine-engine/scratch.c
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <string.h>  /* For memset */
 
 #define LOG_MODULE "scratch"
 #define LOG_VERBOSE
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 575017301..8c9810da1 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -979,6 +979,7 @@ static vo_frame_t *get_next_frame (vos_t *this, int64_t cur_vpts,
       
       if (!img->stream ||
           _x_stream_info_get(img->stream, XINE_STREAM_INFO_VIDEO_HAS_STILL) ||
+          !img->stream->video_fifo ||
           img->stream->video_fifo->size(img->stream->video_fifo) < 10) {
 
         lprintf ("possible still frame\n");
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 17ea5d679..6d6e05b19 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -35,6 +35,7 @@
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <ctype.h>
 #if defined (__linux__) || defined (__GLIBC__)
 #include <endian.h>
 #elif defined (__FreeBSD__)
@@ -819,9 +820,9 @@ void _x_flush_events_queues (xine_stream_t *stream) {
   pthread_mutex_unlock (&stream->event_queues_lock);
 }
 
-static int open_internal (xine_stream_t *stream, const char *mrl) {
+/*static*/ int open_internal (xine_stream_t *stream, const char *mrl) {
 
-  const char *stream_setup;
+  const char *stream_setup = NULL;
   int no_cache = 0;
   
   if (!mrl) {
@@ -846,13 +847,19 @@ static int open_internal (xine_stream_t *stream, const char *mrl) {
    * look for a stream_setup in MRL and try finding an input plugin
    */
 
-  stream_setup = mrl;
-  /* look for the next '#' or try the whole MRL, if none is found */
-  while (*stream_setup &&
-	(stream_setup = (strchr(stream_setup, '#') ? strchr(stream_setup, '#') : strlen(mrl) + mrl))) {
-    char *input_source = (char *)malloc(stream_setup - mrl + 1);
-    memcpy(input_source, mrl, stream_setup - mrl);
-    input_source[stream_setup - mrl] = '\0';
+  if (isalpha (*mrl))
+  {
+    stream_setup = mrl + 1;
+    while (isalnum (*stream_setup) || *stream_setup == '+' || *stream_setup == '-' || *stream_setup == '.')
+      ++stream_setup;
+    if (stream_setup[0] == ':' && stream_setup[1] == '/')
+      stream_setup = strchr (mrl, '#');
+    else
+      stream_setup = NULL;
+  }
+  
+  {
+    char *input_source = strndup (mrl, stream_setup ? stream_setup - mrl : strlen (mrl));
 
     /*
      * find an input plugin
@@ -872,7 +879,6 @@ static int open_internal (xine_stream_t *stream, const char *mrl) {
       res = (stream->input_plugin->open) (stream->input_plugin);
       switch(res) {
       case 1: /* Open successfull */
-	free(input_source);
 	break;
       case -1: /* Open unsuccessfull, but correct plugin */
 	free(input_source);
@@ -885,14 +891,9 @@ static int open_internal (xine_stream_t *stream, const char *mrl) {
 	stream->input_plugin = NULL;
 	stream->err = XINE_ERROR_INPUT_FAILED;
       }
-      if ( res ) break;
     }
 
     free(input_source);
-    /* if we fail when passing up to the first '#' to the input plugins,
-     * maybe the user stated a (invalid) MRL, with a '#' belonging to the
-     * input source -> look for the next '#' and try again */
-    if (*stream_setup) stream_setup++;
   }
   
   if (!stream->input_plugin) {
@@ -902,7 +903,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) {
     return 0;
   }
 
-  if (*stream_setup) {
+  if (stream_setup) {
 
     while (stream_setup && *stream_setup && *(++stream_setup)) {
       if (strncasecmp(stream_setup, "demux", 5) == 0) {
@@ -1640,9 +1641,8 @@ static void config_demux_strategy_cb (void *this_gen, xine_cfg_entry_t *entry) {
 
 static void config_save_cb (void *this_gen, xine_cfg_entry_t *entry) {
   xine_t *this = (xine_t *)this_gen;
-  char *homedir_trail_slash;
+  char homedir_trail_slash[strlen(xine_get_homedir()) + 2];
 
-  homedir_trail_slash = (char *)malloc(strlen(xine_get_homedir()) + 2);
   sprintf(homedir_trail_slash, "%s/", xine_get_homedir());
   if (entry->str_value[0] &&
       (entry->str_value[0] != '/' || strstr(entry->str_value, "/.") ||
@@ -1662,7 +1662,6 @@ static void config_save_cb (void *this_gen, xine_cfg_entry_t *entry) {
     pthread_mutex_unlock(&this->streams_lock);
   }
   
-  free(homedir_trail_slash);
   this->save_path = entry->str_value;
 }
 
diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c
index 6c226c7ef..f6989fbb6 100644
--- a/src/xine-utils/array.c
+++ b/src/xine-utils/array.c
@@ -56,7 +56,7 @@ xine_array_t *xine_array_new(size_t initial_size) {
   if (initial_size < MIN_CHUNK_SIZE)
     initial_size = MIN_CHUNK_SIZE;
 
-  new_array->chunk = (void**)malloc(sizeof(void*) * initial_size);
+  new_array->chunk = (void**)calloc(initial_size, sizeof(void*));
   if (!new_array->chunk) {
     free(new_array);
     return NULL;
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index 39632938f..bb03e5a79 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -40,6 +40,8 @@
 #include <iconv.h>
 #endif
 
+#include "bswap.h"
+
 /* private constants*/
 
 /* private global variables */
@@ -47,6 +49,45 @@ static const char * lexbuf;
 static int lexbuf_size = 0;
 static int lexbuf_pos  = 0;
 static int in_comment  = 0;
+static char *lex_malloc = NULL;
+
+enum utf { UTF32BE, UTF32LE, UTF16BE, UTF16LE };
+
+static void lex_convert (const char * buf, int size, enum utf utf)
+{
+  char *utf8 = malloc (size * (utf >= UTF16BE ? 3 : 6) + 1);
+  char *bp = utf8;
+  while (size > 0)
+  {
+    uint32_t c = 0;
+    switch (utf)
+    {
+    case UTF32BE: c = _X_BE_32 (buf); buf += 4; break;
+    case UTF32LE: c = _X_LE_32 (buf); buf += 4; break;
+    case UTF16BE: c = _X_BE_16 (buf); buf += 2; break;
+    case UTF16LE: c = _X_LE_16 (buf); buf += 2; break;
+    }
+    if (!c)
+      break; /* embed a NUL, get a truncated string */
+    if (c < 128)
+      *bp++ = c;
+    else
+    {
+      int count = (c >= 0x04000000) ? 5 :
+		  (c >= 0x00200000) ? 4 :
+		  (c >= 0x00010000) ? 3 :
+		  (c >= 0x00000800) ? 2 : 1;
+      *bp = (char)(0x1F80 >> count);
+      count *= 6;
+      *bp++ |= c >> count;
+      while ((count -= 6) >= 0)
+	*bp++ = 128 | ((c >> count) & 0x3F);
+    }
+  }
+  *bp = 0;
+  lexbuf_size = bp - utf8;
+  lexbuf = lex_malloc = realloc (utf8, lexbuf_size + 1);
+}
 
 static enum {
   NORMAL,
@@ -55,8 +96,29 @@ static enum {
 } lex_mode = NORMAL;
 
 void lexer_init(const char * buf, int size) {
+  static const char boms[] = { 0xFF, 0xFE, 0, 0, 0xFE, 0xFF },
+		    bom_utf8[] = { 0xEF, 0xBB, 0xBF };
+
+  free (lex_malloc);
+  lex_malloc = NULL;
+
   lexbuf      = buf;
   lexbuf_size = size;
+
+  if (size >= 4 && !memcmp (buf, boms + 2, 4))
+    lex_convert (buf + 4, size - 4, UTF32BE);
+  else if (size >= 4 && !memcmp (buf, boms, 4))
+    lex_convert (buf + 4, size - 4, UTF32LE);
+  else if (size >= 3 && !memcmp (buf, bom_utf8, 3))
+  {
+    lexbuf += 3;
+    lexbuf_size -= 3;
+  }
+  else if (size >= 2 && !memcmp (buf, boms + 4, 2))
+    lex_convert (buf + 2, size - 2, UTF16BE);
+  else if (size >= 2 && !memcmp (buf, boms, 2))
+    lex_convert (buf + 2, size - 2, UTF16LE);
+
   lexbuf_pos  = 0;
   lex_mode    = NORMAL;
   in_comment  = 0;