← Back to branch summary

~siretart/xine-lib/ubuntu

« back to all changes in this revision

Viewing changes to src/input/input_dvb.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2005-12-15 13:13:45 UTC
  • mfrom: (0.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051215131345-8n4osv1j7fy9c1s1
* SECURITY UPDATE: Fix arbitrary code execution with crafted PNG images in
  embedded ffmpeg copy.
* src/libffmpeg/libavcodec/utils.c, avcodec_default_get_buffer(): Apply
  upstream patch to fix buffer overflow on decoding of small PIX_FMT_PAL8
  PNG files.
* References:
  CVE-2005-4048
  http://mplayerhq.hu/pipermail/ffmpeg-devel/2005-November/005333.html
  http://www1.mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/
  utils.c.diff?r1=1.161&r2=1.162&cvsroot=FFMpeg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/input/input_dvb.c
88
88
#endif
89
89
#include <sys/poll.h>
90
90
#include <time.h>
 
91
#ifdef HAVE_DIRENT_H
91
92
#include <dirent.h>
 
93
#endif
92
94
#include <ctype.h>
93
95
 
94
96
/* These will eventually be #include <linux/dvb/...> */
2098
2100
 char dates[64];
2099
2101
 int x=0;
2100
2102
 xine_cfg_entry_t savedir;
 
2103
 DIR *dir;
 
2104
 
2101
2105
 if (this->record_fd > -1) {
2102
2106
 
2103
2107
    /* stop recording */
2120
2124
    
2121
2125
    if (xine_config_lookup_entry(this->stream->xine, "media.capture.save_dir", &savedir)){
2122
2126
      if(strlen(savedir.str_value)>1){
2123
 
        if(opendir(savedir.str_value)==NULL){
 
2127
        if((dir = opendir(savedir.str_value))==NULL){
2124
2128
          snprintf (filename, 256, "%s/%s_%s.ts",xine_get_homedir(),this->channels[this->channel].name, dates);
2125
2129
          xprintf(this->class->xine,XINE_VERBOSITY_LOG,"savedir is wrong... saving to home directory\n");
2126
2130
        } else {
 
2131
          closedir(dir);
2127
2132
          snprintf (filename, 256, "%s/%s_%s.ts",savedir.str_value,this->channels[this->channel].name, dates);
2128
2133
          xprintf(this->class->xine,XINE_VERBOSITY_LOG,"saving to savedir\n");
2129
2134
        }
3196
3201
 
3197
3202
plugin_info_t xine_plugin_info[] = {
3198
3203
  /* type, API, "name", version, special_info, init_function */
3199
 
  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 16, "DVB", XINE_VERSION_CODE, NULL, init_class },
 
3204
  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "DVB", XINE_VERSION_CODE, NULL, init_class },
3200
3205
  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
3201
3206
};