May 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36242 - in branches/1.1: . DOCS/man/en/mplayer.1 asxparser.c cfg-mplayer.h mplayer.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 19:18:01 2013 New Revision: 36242 Log: Merge playlist fixes. These were revisions 36238, 36239, 36240 and 36241 from trunk. Modified: branches/1.1/ (props changed) branches/1.1/DOCS/man/en/mplayer.1 branches/1.1/asxparser.c branches/1.1/cfg-mplayer.h branches/1.1/mplayer.c Modified: branches/1.1/DOCS/man/en/mplayer.1 ============================================================================== --- branches/1.1/DOCS/man/en/mplayer.1 Sun May 5 19:02:35 2013 (r36241) +++ branches/1.1/DOCS/man/en/mplayer.1 Sun May 5 19:18:01 2013 (r36242) @@ -1259,6 +1259,15 @@ Expand TEXT only if the property NAME is Play files according to a playlist file (ASX, Winamp, SMIL, or one-file-per-line format). .br +.I WARNING: +The way MPlayer parses and uses playlist files is not safe against +maliciously constructed files. +Such files may trigger harmful actions. +This has been the case for all MPlayer versions, but unfortunately this +fact was not well documented earlier, and some people have even misguidedly +recommended use of -playlist with untrusted sources. +Do NOT use -playlist with random internet sources or files you don't trust! +.br .I NOTE: This option is considered an entry so options found after it will apply only to the elements of this playlist. @@ -1266,6 +1275,13 @@ only to the elements of this playlist. FIXME: This needs to be clarified and documented thoroughly. . .TP +.B \-allow-dangerous-playlist-parsing +This enables parsing any file as a playlist if e.g. a server advertises +a file as playlist. +Only enable if you know all servers involved are trustworthy. +MPlayer's playlist code is not designed to handle malicious playlist files. +. +.TP .B \-rtc\-device <device> Use the specified device for RTC timing. . Modified: branches/1.1/asxparser.c ============================================================================== --- branches/1.1/asxparser.c Sun May 5 19:02:35 2013 (r36241) +++ branches/1.1/asxparser.c Sun May 5 19:18:01 2013 (r36242) @@ -388,7 +388,7 @@ asx_get_element(ASX_Parser_t* parser,cha static void asx_parse_param(ASX_Parser_t* parser, char** attribs, play_tree_t* pt) { - char *name,*val; + char *name = NULL,*val = NULL; name = asx_get_attrib("NAME",attribs); if(!name) { @@ -402,9 +402,11 @@ asx_parse_param(ASX_Parser_t* parser, ch mp_msg(MSGT_PLAYTREE,MSGL_WARN,"=%s\n",val); else mp_msg(MSGT_PLAYTREE,MSGL_WARN,"\n"); - return; + goto err_out; } - play_tree_set_param(pt,name,val); + mp_msg(MSGT_PLAYTREE, MSGL_ERR, "Support for specifying parameters in playlists has been disabled.\n"); +// play_tree_set_param(pt,name,val); +err_out: free(name); free(val); } Modified: branches/1.1/cfg-mplayer.h ============================================================================== --- branches/1.1/cfg-mplayer.h Sun May 5 19:02:35 2013 (r36241) +++ branches/1.1/cfg-mplayer.h Sun May 5 19:18:01 2013 (r36242) @@ -306,6 +306,8 @@ const m_option_t mplayer_opts[]={ {"noloop", &mpctx_s.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL}, {"loop", &mpctx_s.loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, NULL}, + {"allow-dangerous-playlist-parsing", &allow_playlist_parsing, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noallow-dangerous-playlist-parsing", &allow_playlist_parsing, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"playlist", NULL, CONF_TYPE_STRING, CONF_NOCFG, 0, 0, NULL}, {"shuffle", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL}, {"noshuffle", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL}, Modified: branches/1.1/mplayer.c ============================================================================== --- branches/1.1/mplayer.c Sun May 5 19:02:35 2013 (r36241) +++ branches/1.1/mplayer.c Sun May 5 19:18:01 2013 (r36242) @@ -328,6 +328,8 @@ static char *prog_path; static int crash_debug; #endif +static int allow_playlist_parsing; + /* This header requires all the global variable declarations. */ #include "cfg-mplayer.h" @@ -3234,8 +3236,12 @@ play_next_file: current_module = "handle_playlist"; mp_msg(MSGT_CPLAYER, MSGL_V, "Parsing playlist %s...\n", filename_recode(filename)); - entry = parse_playtree(mpctx->stream, use_gui); - mpctx->eof = playtree_add_playlist(entry); + if (allow_playlist_parsing) { + entry = parse_playtree(mpctx->stream, use_gui); + mpctx->eof = playtree_add_playlist(entry); + } else { + mp_msg(MSGT_CPLAYER, MSGL_ERR, "Playlist parsing disabled for security reasons. Ignoring file.\n"); + } goto goto_next_file; } mpctx->stream->start_pos += seek_to_byte;

1 0

r36240 - in trunk: DOCS/man/en/mplayer.1 cfg-mplayer.h mplayer.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 19:02:33 2013 New Revision: 36240 Log: Allow parsing arbitrary files as playlist only if explicitly enabled. Modified: trunk/cfg-mplayer.h trunk/mplayer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h Sun May 5 19:02:31 2013 (r36239) +++ trunk/cfg-mplayer.h Sun May 5 19:02:33 2013 (r36240) @@ -307,6 +307,8 @@ const m_option_t mplayer_opts[]={ {"noloop", &mpctx_s.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL}, {"loop", &mpctx_s.loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, NULL}, + {"allow-dangerous-playlist-parsing", &allow_playlist_parsing, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noallow-dangerous-playlist-parsing", &allow_playlist_parsing, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"playlist", NULL, CONF_TYPE_STRING, CONF_NOCFG, 0, 0, NULL}, {"shuffle", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL}, {"noshuffle", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL}, Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun May 5 19:02:31 2013 (r36239) +++ trunk/mplayer.c Sun May 5 19:02:33 2013 (r36240) @@ -330,6 +330,8 @@ static char *prog_path; static int crash_debug; #endif +static int allow_playlist_parsing; + /* This header requires all the global variable declarations. */ #include "cfg-mplayer.h" @@ -3245,8 +3247,12 @@ play_next_file: current_module = "handle_playlist"; mp_msg(MSGT_CPLAYER, MSGL_V, "Parsing playlist %s...\n", filename_recode(filename)); - entry = parse_playtree(mpctx->stream, use_gui); - mpctx->eof = playtree_add_playlist(entry); + if (allow_playlist_parsing) { + entry = parse_playtree(mpctx->stream, use_gui); + mpctx->eof = playtree_add_playlist(entry); + } else { + mp_msg(MSGT_CPLAYER, MSGL_ERR, "Playlist parsing disabled for security reasons. Ignoring file.\n"); + } goto goto_next_file; } mpctx->stream->start_pos += seek_to_byte;

1 0

r36239 - trunk/asxparser.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 19:02:31 2013 New Revision: 36239 Log: Fix memory leak. Modified: trunk/asxparser.c Modified: trunk/asxparser.c ============================================================================== --- trunk/asxparser.c Sun May 5 19:02:30 2013 (r36238) +++ trunk/asxparser.c Sun May 5 19:02:31 2013 (r36239) @@ -389,7 +389,7 @@ asx_get_element(ASX_Parser_t* parser,cha static void asx_parse_param(ASX_Parser_t* parser, char** attribs, play_tree_t* pt) { - char *name,*val; + char *name = NULL,*val = NULL; name = asx_get_attrib("NAME",attribs); if(!name) { @@ -403,10 +403,11 @@ asx_parse_param(ASX_Parser_t* parser, ch mp_msg(MSGT_PLAYTREE,MSGL_WARN,"=%s\n",val); else mp_msg(MSGT_PLAYTREE,MSGL_WARN,"\n"); - return; + goto err_out; } mp_msg(MSGT_PLAYTREE, MSGL_ERR, "Support for specifying parameters in playlists has been disabled.\n"); // play_tree_set_param(pt,name,val); +err_out: free(name); free(val); }

1 0

r36238 - trunk/asxparser.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 19:02:30 2013 New Revision: 36238 Log: Disable dangerous feature in ASX playlist parser. Modified: trunk/asxparser.c Modified: trunk/asxparser.c ============================================================================== --- trunk/asxparser.c Sun May 5 09:27:33 2013 (r36237) +++ trunk/asxparser.c Sun May 5 19:02:30 2013 (r36238) @@ -405,7 +405,8 @@ asx_parse_param(ASX_Parser_t* parser, ch mp_msg(MSGT_PLAYTREE,MSGL_WARN,"\n"); return; } - play_tree_set_param(pt,name,val); + mp_msg(MSGT_PLAYTREE, MSGL_ERR, "Support for specifying parameters in playlists has been disabled.\n"); +// play_tree_set_param(pt,name,val); free(name); free(val); }

1 0

r36236 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 09:27:32 2013 New Revision: 36236 Log: Less strict check for width/height. Due to cropping AVFrame dimensions can be larger than the display size. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun May 5 09:27:31 2013 (r36235) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun May 5 09:27:32 2013 (r36236) @@ -940,8 +940,8 @@ static mp_image_t *decode(sh_video_t *sh return NULL; } - if (mpi->w != pic->width || mpi->h != pic->height || - pic->width != avctx->width || pic->height != avctx->height) { + if (mpi->w != avctx->width || mpi->h != avctx->height || + pic->width < mpi->w || pic->height < mpi->h) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Dropping frame with size not matching configured size (%ix%i vs %ix%i vs %ix%i)\n", mpi->w, mpi->h, pic->width, pic->height, avctx->width, avctx->height); return NULL;

2 1

r36237 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 09:27:33 2013 New Revision: 36237 Log: Update calculation of allocation size for direct rendering. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun May 5 09:27:32 2013 (r36236) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun May 5 09:27:33 2013 (r36237) @@ -552,8 +552,8 @@ static int get_buffer(AVCodecContext *av mp_image_t *mpi=NULL; int flags= MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; int type= MP_IMGTYPE_IPB; - int width= avctx->width; - int height= avctx->height; + int width = FFMAX(avctx->width, -(-avctx->coded_width >> avctx->lowres)); + int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres)); // special case to handle reget_buffer if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE)) return 0;

1 0

r36235 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 09:27:31 2013 New Revision: 36235 Log: Remove pointless cast. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun May 5 09:27:29 2013 (r36234) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun May 5 09:27:31 2013 (r36235) @@ -929,7 +929,7 @@ static mp_image_t *decode(sh_video_t *sh if(init_vo(sh, avctx->pix_fmt) < 0) return NULL; if(dr1 && pic->opaque){ - mpi= (mp_image_t *)pic->opaque; + mpi=pic->opaque; } if(!mpi)

1 0

r36234 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 09:27:29 2013 New Revision: 36234 Log: Add more information to error message. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat May 4 23:55:52 2013 (r36233) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun May 5 09:27:29 2013 (r36234) @@ -942,7 +942,8 @@ static mp_image_t *decode(sh_video_t *sh if (mpi->w != pic->width || mpi->h != pic->height || pic->width != avctx->width || pic->height != avctx->height) { - mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Dropping frame with size not matching configured size\n"); + mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Dropping frame with size not matching configured size (%ix%i vs %ix%i vs %ix%i)\n", + mpi->w, mpi->h, pic->width, pic->height, avctx->width, avctx->height); return NULL; }

1 0

r36233 - trunk/libao2/ao_jack.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 23:55:52 2013 New Revision: 36233 Log: Make code simpler and more flexible. Modified: trunk/libao2/ao_jack.c Modified: trunk/libao2/ao_jack.c ============================================================================== --- trunk/libao2/ao_jack.c Sat May 4 23:44:42 2013 (r36232) +++ trunk/libao2/ao_jack.c Sat May 4 23:55:52 2013 (r36233) @@ -245,12 +245,12 @@ static int init(int rate, int channels, if (!port_name) port_flags |= JackPortIsPhysical; matching_ports = jack_get_ports(client, port_name, NULL, port_flags); - if (!matching_ports || !matching_ports[0]) { + i = 0; + while (matching_ports && matching_ports[i]) i++; + if (!i) { mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] no physical ports available\n"); goto err_out; } - i = 1; - while (matching_ports[i]) i++; if (channels > i) channels = i; num_ports = channels; @@ -268,7 +268,7 @@ static int init(int rate, int channels, mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] activate failed\n"); goto err_out; } - for (i = 0; i < num_ports; i++) { + for (i = 0; i < num_ports && matching_ports && matching_ports[i]; i++) { if (jack_connect(client, jack_port_name(ports[i]), matching_ports[i])) { mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] connecting failed\n"); goto err_out;

1 0

r36221 - in trunk/libvo: gl_common.c gl_common.h matrixview.c vo_gl.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 17:20:42 2013 New Revision: 36221 Log: Avoid glColor4f, use glColor4ub instead. Modified: trunk/libvo/gl_common.c trunk/libvo/gl_common.h trunk/libvo/matrixview.c trunk/libvo/vo_gl.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat May 4 15:28:14 2013 (r36220) +++ trunk/libvo/gl_common.c Sat May 4 17:20:42 2013 (r36221) @@ -63,7 +63,6 @@ void (GLAPIENTRY *mpglDeleteTextures)(GL void (GLAPIENTRY *mpglTexEnvf)(GLenum, GLenum, GLfloat); void (GLAPIENTRY *mpglTexEnvi)(GLenum, GLenum, GLint); void (GLAPIENTRY *mpglColor4ub)(GLubyte, GLubyte, GLubyte, GLubyte); -void (GLAPIENTRY *mpglColor4f)(GLfloat, GLfloat, GLfloat, GLfloat); void (GLAPIENTRY *mpglClearColor)(GLclampf, GLclampf, GLclampf, GLclampf); void (GLAPIENTRY *mpglClearDepth)(double); void (GLAPIENTRY *mpglDepthFunc)(GLenum); @@ -459,7 +458,6 @@ static const extfunc_desc_t extfuncs[] = DEF_FUNC_DESC(TexEnvf), DEF_FUNC_DESC(TexEnvi), DEF_FUNC_DESC(Color4ub), - DEF_FUNC_DESC(Color4f), DEF_FUNC_DESC(ClearColor), DEF_FUNC_DESC(ClearDepth), DEF_FUNC_DESC(DepthFunc), Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Sat May 4 15:28:14 2013 (r36220) +++ trunk/libvo/gl_common.h Sat May 4 17:20:42 2013 (r36221) @@ -252,7 +252,6 @@ extern void (GLAPIENTRY *mpglDeleteTextu extern void (GLAPIENTRY *mpglTexEnvf)(GLenum, GLenum, GLfloat); extern void (GLAPIENTRY *mpglTexEnvi)(GLenum, GLenum, GLint); extern void (GLAPIENTRY *mpglColor4ub)(GLubyte, GLubyte, GLubyte, GLubyte); -extern void (GLAPIENTRY *mpglColor4f)(GLfloat, GLfloat, GLfloat, GLfloat); extern void (GLAPIENTRY *mpglClearColor)(GLclampf, GLclampf, GLclampf, GLclampf); extern void (GLAPIENTRY *mpglClearDepth)(double); extern void (GLAPIENTRY *mpglDepthFunc)(GLenum); Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Sat May 4 15:28:14 2013 (r36220) +++ trunk/libvo/matrixview.c Sat May 4 17:20:42 2013 (r36221) @@ -71,13 +71,13 @@ static void draw_char(int num, float lig num &= 63; //light = light / 255; //light=7-light;num+=(light*60); - light = light / 255 * matrix_brightness; + light *= matrix_brightness; num2 = num / 10; num3 = num - (num2 * 10); ty = (float)num2 / 7; tx = (float)num3 / 10; mpglNormal3f(0.0f, 0.0f, 1.0f); // Needed for lighting - mpglColor4f(0.0, 1.0, 0.0, light); // Basic polygon color + mpglColor4ub(0, 255, 255, light); // Basic polygon color mpglTexCoord2f(tx, ty); mpglVertex3f(x, y, z); @@ -99,7 +99,7 @@ static void draw_illuminatedchar(int num ty = (float)num2 / 7; tx = (float)num3 / 10; mpglNormal3f(0.0f, 0.0f, 1.0f); // Needed for lighting - mpglColor4f(1.0, 1.0, 1.0, .5); // Basic polygon color + mpglColor4ub(255, 255, 255, 128); // Basic polygon color mpglTexCoord2f(tx, ty); mpglVertex3f(x, y, z); @@ -114,7 +114,7 @@ static void draw_illuminatedchar(int num static void draw_flare(float x, float y, float z) //flare { mpglNormal3f(0.0f, 0.0f, 1.0f); // Needed for lighting - mpglColor4f(1.0, 1.0, 1.0, .8); // Basic polygon color + mpglColor4ub(255, 255, 255, 204); // Basic polygon color mpglTexCoord2f(0, 0); mpglVertex3f(x - 1, y + 1, z); Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sat May 4 15:28:14 2013 (r36220) +++ trunk/libvo/vo_gl.c Sat May 4 17:20:42 2013 (r36221) @@ -899,7 +899,7 @@ static void draw_osd(void) } static void do_render(void) { - mpglColor4f(1,1,1,1); + mpglColor4ub(255, 255, 255, 255); if (is_yuv || is_xyz || custom_prog) glEnableYUVConversion(gl_target, yuvconvtype); if (stereo_mode) {

3 2