diff options
| author | Philip Gladstone <philipjsg@users.sourceforge.net> | 2003-04-12 03:03:26 +0000 |
|---|---|---|
| committer | Philip Gladstone <philipjsg@users.sourceforge.net> | 2003-04-12 03:03:26 +0000 |
| commit | 03ff071af9d9a40cb3dae7a0989d7fa8a51aba8b (patch) | |
| tree | bc4e5b7b37ededb31f08b3641b161a1a4954cf27 /ffserver.c | |
| parent | be0d154911a28d4cdac081ca3c0c38404c42a392 (diff) | |
Fix a horrible bug with the launch keyword not handling arguments of length 1!
Originally committed as revision 1761 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ffserver.c b/ffserver.c index 5f5b37408e..265e3ac579 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3823,11 +3823,8 @@ static int parse_ffconfig(const char *filename) if (!argbuf[0]) break; - if (strlen(argbuf + 1)) { - feed->child_argv[i] = av_malloc(strlen(argbuf + 1)); - strcpy(feed->child_argv[i], argbuf); - } else - feed->child_argv[i] = NULL; + feed->child_argv[i] = av_malloc(strlen(argbuf) + 1); + strcpy(feed->child_argv[i], argbuf); } feed->child_argv[i] = av_malloc(30 + strlen(feed->filename)); |