Browse Source

ffserver: Fix off by 1 error in path

Code suggested by ubitux

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.0
Michael Niedermayer 8 years ago
parent
commit
617f0c65e1
1 changed files with 10 additions and 14 deletions
  1. +10
    -14
      fftools/ffserver.c

+ 10
- 14
fftools/ffserver.c View File

@@ -476,7 +476,7 @@ static int compute_datarate(DataRateData *drd, int64_t count)
static void start_children(FFServerStream *feed)
{
char *pathname;
char *slash;
char *dirname, *prog;
int i;
size_t cmd_length;

@@ -495,22 +495,18 @@ static void start_children(FFServerStream *feed)
return;
}

slash = strrchr(my_program_name, '/');
if (!slash) {
pathname = av_mallocz(sizeof("ffmpeg"));
} else {
pathname = av_mallocz(slash - my_program_name + sizeof("ffmpeg"));
if (pathname != NULL) {
memcpy(pathname, my_program_name, slash - my_program_name);
}
}
if (!pathname) {
/* use "ffmpeg" in the path of current program. Ignore user provided path */
prog = av_strdup(my_program_name);
if (prog) {
dirname = av_dirname(prog);
pathname = *dirname ? av_asprintf("%s/%s", dirname, "ffmpeg")
: av_asprintf("ffmpeg");
av_free(prog);
}
if (!prog || !pathname) {
http_log("Could not allocate memory for children cmd line\n");
return;
}
/* use "ffmpeg" in the path of current program. Ignore user provided path */

strcat(pathname, "ffmpeg");

for (; feed; feed = feed->next) {



Loading…
Cancel
Save