Skip to content
Browse files

opt: re-enable memleak fix for duplicated options.

The memleak fix in a1bcc76 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.
  • Loading branch information...
1 parent 12fe78a commit 19c41c6d8ef6cc34cfde6bf877e059689e763bb7 @ubitux ubitux committed with ubitux Nov 15, 2012
Showing with 6 additions and 2 deletions.
  1. +1 −1 cmdutils.c
  2. +5 −1 ffserver.c
View
2 cmdutils.c
@@ -278,7 +278,7 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt,
if (po->flags & OPT_STRING) {
char *str;
str = av_strdup(arg);
-// av_freep(dst);
+ av_freep(dst);
*(char **)dst = str;
} else if (po->flags & OPT_BOOL || po->flags & OPT_INT) {
*(int *)dst = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
View
6 ffserver.c
@@ -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') {

0 comments on commit 19c41c6

Please sign in to comment.
Something went wrong with that request. Please try again.