Mercurial > mplayer.hg
comparison input/input.c @ 12890:9a45f43bf9a0
false-use-of-get_path() memleak fixes.
author | al |
---|---|
date | Fri, 23 Jul 2004 16:10:21 +0000 |
parents | 96b807836eca |
children | abe577c2b12e |
comparison
equal
deleted
inserted
replaced
12889:5ee3a571c351 | 12890:9a45f43bf9a0 |
---|---|
1482 | 1482 |
1483 file = config_file[0] != '/' ? get_path(config_file) : config_file; | 1483 file = config_file[0] != '/' ? get_path(config_file) : config_file; |
1484 if(!file) | 1484 if(!file) |
1485 return; | 1485 return; |
1486 | 1486 |
1487 if(! mp_input_parse_config(file)) { | 1487 if( mp_input_parse_config(file)) { |
1488 free(file); // release the buffer created by get_path() | |
1489 } | |
1490 else { | |
1488 // Try global conf dir | 1491 // Try global conf dir |
1489 file = MPLAYER_CONFDIR "/input.conf"; | 1492 file = MPLAYER_CONFDIR "/input.conf"; |
1490 if(! mp_input_parse_config(file)) | 1493 if(! mp_input_parse_config(file)) |
1491 mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n"); | 1494 mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n"); |
1492 } | 1495 } |