On Sat, 18 Oct 2014, Vittorio Giovara wrote:
From: Michael Niedermayer <[email protected]>
CC: [email protected]
Bug-Id: CID 1135748
---
libavformat/hdsenc.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c
index 53fef33..f41381d 100644
--- a/libavformat/hdsenc.c
+++ b/libavformat/hdsenc.c
@@ -204,7 +204,10 @@ static int write_manifest(AVFormatContext *s, int final)
avio_printf(out, "</manifest>\n");
avio_flush(out);
avio_close(out);
- rename(temp_filename, filename);
+ if (rename(temp_filename, filename) == -1) {
+ av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n",
temp_filename, filename);
+ return AVERROR(errno);
+ }
return 0;
}
@@ -286,7 +289,10 @@ static int write_abst(AVFormatContext *s, OutputStream
*os, int final)
update_size(out, afrt_pos);
update_size(out, 0);
avio_close(out);
- rename(temp_filename, filename);
+ if (rename(temp_filename, filename) == -1) {
+ av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n",
temp_filename, filename);
+ return AVERROR(errno);
+ }
return 0;
}
@@ -481,7 +487,10 @@ static int hds_flush(AVFormatContext *s, OutputStream *os,
int final,
snprintf(target_filename, sizeof(target_filename),
"%s/stream%dSeg1-Frag%d", s->filename, index, os->fragment_index);
- rename(os->temp_filename, target_filename);
+ if (rename(os->temp_filename, target_filename) == -1) {
+ av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n",
os->temp_filename, target_filename);
+ return AVERROR(errno);
+ }
add_fragment(os, target_filename, os->frag_start_ts, end_ts -
os->frag_start_ts);
if (!final) {
--
1.9.3 (Apple Git-50)
Sure, ok.
A failure here wouldn't be fatal for the muxer in the sense that it
wouldn't make the muxer crash, and if a rename fails, some of the other
file output functions also most probably would fail, but I don't mind
adding checks.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
