diff options
| author | Martin Storsjö <martin@martin.st> | 2014-09-05 22:45:11 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-09-07 23:20:29 +0300 |
| commit | 803e82276b3716bf6012ec69e8854dae14a4fd2b (patch) | |
| tree | f877587fe407bf32eb417899d927f68f8cf60b78 | |
| parent | 041caf1a63f091745b95a6d51c23fbdcb604d4ce (diff) | |
| download | ffmpeg-803e82276b3716bf6012ec69e8854dae14a4fd2b.tar.gz | |
libavformat: Check mkdir return error codes
Previously, the returned error codes were intentionally ignored
(see fadd3a68213), to avoid aborting if the directory already
existed. If the mkdir actually failed, this was caught when
opening files within the directory fails anyway.
By handling the error code here (but explicitly ignoring EEXIST),
the error messages and return codes in these cases are more
appropriate and less confusing.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/hdsenc.c | 5 | ||||
| -rw-r--r-- | libavformat/smoothstreamingenc.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index 6217c1f51f..882f157d91 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -323,7 +323,10 @@ static int hds_write_header(AVFormatContext *s) int ret = 0, i; AVOutputFormat *oformat; - mkdir(s->filename, 0777); + if (mkdir(s->filename, 0777) == -1 && errno != EEXIST) { + ret = AVERROR(errno); + goto fail; + } oformat = av_guess_format("flv", NULL, NULL); if (!oformat) { diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 457472dc83..d955b3437e 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -292,7 +292,10 @@ static int ism_write_header(AVFormatContext *s) int ret = 0, i; AVOutputFormat *oformat; - mkdir(s->filename, 0777); + if (mkdir(s->filename, 0777) == -1 && errno != EEXIST) { + ret = AVERROR(errno); + goto fail; + } oformat = av_guess_format("ismv", NULL, NULL); if (!oformat) { @@ -319,7 +322,10 @@ static int ism_write_header(AVFormatContext *s) goto fail; } snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%d)", s->filename, s->streams[i]->codec->bit_rate); - mkdir(os->dirname, 0777); + if (mkdir(os->dirname, 0777) == -1 && errno != EEXIST) { + ret = AVERROR(errno); + goto fail; + } ctx = avformat_alloc_context(); if (!ctx) { |