opt: re-enable memleak fix for duplicated options.
The memleak fix in a1bcc76e
was causing problems when the original
string wasn't NULL or av_malloc'ed, thus was disabled. It seems the only
OPT_STRING occurence where it needed to be fixed is in ffserver. This
commit fixes that specific problem and so re-enable the original code.
This commit is contained in:
committed by
Clément Bœsch
parent
12fe78a77b
commit
19c41c6d8e
@@ -308,7 +308,7 @@ static int rtp_new_av_stream(HTTPContext *c,
|
||||
|
||||
static const char *my_program_name;
|
||||
|
||||
static const char *config_filename = "/etc/ffserver.conf";
|
||||
static const char *config_filename;
|
||||
|
||||
static int ffserver_debug;
|
||||
static int no_launch;
|
||||
@@ -4716,6 +4716,9 @@ int main(int argc, char **argv)
|
||||
|
||||
parse_options(NULL, argc, argv, options, NULL);
|
||||
|
||||
if (!config_filename)
|
||||
config_filename = av_strdup("/etc/ffserver.conf");
|
||||
|
||||
unsetenv("http_proxy"); /* Kill the http_proxy */
|
||||
|
||||
av_lfg_init(&random_state, av_get_random_seed());
|
||||
@@ -4728,6 +4731,7 @@ int main(int argc, char **argv)
|
||||
fprintf(stderr, "Incorrect config file - exiting.\n");
|
||||
exit(1);
|
||||
}
|
||||
av_freep(&config_filename);
|
||||
|
||||
/* open log file if needed */
|
||||
if (logfilename[0] != '\0') {
|
||||
|
Reference in New Issue
Block a user