summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-26 13:56:15 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-26 14:04:55 +0300
commitae0f9e26583fcb333018759df1c085b081615b61 (patch)
treeab3dc1886934ca4dca4bf4a4ce25cba195b90f71
parent529d1066274fc24c6a7ca5a8230c198167a5f7c0 (diff)
downloadmpv-ae0f9e26583fcb333018759df1c085b081615b61.tar.bz2
mpv-ae0f9e26583fcb333018759df1c085b081615b61.tar.xz
Disable automatic playlist parsing properly
The playlist code is unsafe to use with potentially hostile sources. It was disabled by default for local files but not for network streams. Make sure it is not automatically triggered for network streams either.
-rw-r--r--mplayer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 11e1629a21..ebdc7d7cc3 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3158,6 +3158,11 @@ if (edl_output_filename) {
#endif
if(mpctx->file_format == DEMUXER_TYPE_PLAYLIST) {
+ mp_msg(MSGT_CPLAYER, MSGL_ERR, "\nThis looks like a playlist, but "
+ "playlist support will not be used automatically.\n"
+ "MPlayer's playlist code is unsafe and should only be used with "
+ "trusted sources.\nPlayback will probably fail.\n\n");
+#if 0
play_tree_t* entry;
// Handle playlist
current_module="handle_playlist";
@@ -3166,6 +3171,7 @@ if (edl_output_filename) {
entry = parse_playtree(mpctx->stream, mpctx->mconfig, 0);
mpctx->eof=playtree_add_playlist(mpctx, entry);
goto goto_next_file;
+#endif
}
mpctx->stream->start_pos+=seek_to_byte;