RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Limit amount of data allocated on stack, strlen(filename) is not a good idea for 

file name strings that might come from arbitrary playlists, use PATH_MAX instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29636 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-09-02 19:49:10 +00:00
parent 8eaac76141
commit 76cb85c056
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mplayer.c
View File

@ -931,9 +931,13 @@ static int try_load_config(m_config_t *conf, const char *file)
static void load_per_file_config (m_config_t* conf, const char *const file)
{
char *confpath;
char cfg[strlen(file)+10];
char cfg[PATH_MAX];
char *name;
if (strlen(file) > PATH_MAX - 14) {
mp_msg(MSGT_CPLAYER, MSGL_WARN, "Filename is too long, can not load file or directory specific config files\n");
return;
}
sprintf (cfg, "%s.conf", file);
name = strrchr(cfg, '/');
@ -951,7 +955,7 @@ static void load_per_file_config (m_config_t* conf, const char *const file)
name++;
if (use_filedir_conf) {
char dircfg[strlen(file)+14];
char dircfg[PATH_MAX];
strcpy(dircfg, cfg);
strcpy(dircfg + (name - cfg), "mplayer.conf");
try_load_config(conf, dircfg);