diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2003-04-11 09:43:05 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-04-11 09:43:05 +0000 |
| commit | a7beab731d1579967de16ebdf33805189fbd087f (patch) | |
| tree | 834e1d2a69fe6e89e91fa49de0745bd6b442fd92 /ffserver.c | |
| parent | 2f5feea48ba72b5b80a83a7d3142626555264c37 (diff) | |
bunch of small thing patch by (Roman Shaposhnick <rvs at sun dot com>)
Originally committed as revision 1753 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index 8b220b48f6..ceca3df824 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3823,8 +3823,11 @@ static int parse_ffconfig(const char *filename) if (!argbuf[0]) break; - feed->child_argv[i] = av_malloc(strlen(argbuf + 1)); - strcpy(feed->child_argv[i], argbuf); + 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(30 + strlen(feed->filename)); |