opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fftools/textformat: correctly propagate uninit error codes

Browse Source 
This allows catching IO errors occuring at file close.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2025-05-07 12:45:16 +02:00
parent a124c9a580
commit 0d6ef6f545
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/textformat/avtextformat.c
View File

@ -113,7 +113,7 @@ int avtext_context_close(AVTextFormatContext **ptctx)
if (tctx->formatter) {
if (tctx->formatter->uninit)
tctx->formatter->uninit(tctx);
ret = tctx->formatter->uninit(tctx);
if (tctx->formatter->priv_class)
av_opt_free(tctx->priv);
}
@ -627,7 +627,7 @@ int avtextwriter_context_close(AVTextWriterContext **pwctx)
if (wctx->writer) {
if (wctx->writer->uninit)
wctx->writer->uninit(wctx);
ret = wctx->writer->uninit(wctx);
if (wctx->writer->priv_class)
av_opt_free(wctx->priv);
}

2
fftools/textformat/avtextformat.h
View File

@ -97,7 +97,7 @@ typedef struct AVTextFormatter {
const char *name;
int (*init) (AVTextFormatContext *tctx);
void (*uninit)(AVTextFormatContext *tctx);
int (*uninit)(AVTextFormatContext *tctx);
void (*print_section_header)(AVTextFormatContext *tctx, const void *data);
void (*print_section_footer)(AVTextFormatContext *tctx);

2
fftools/textformat/avtextwriters.h
View File

@ -33,7 +33,7 @@ typedef struct AVTextWriter {
const char *name;
int (*init)(AVTextWriterContext *wctx);
void (*uninit)(AVTextWriterContext *wctx);
int (*uninit)(AVTextWriterContext *wctx);
void (*writer_w8)(AVTextWriterContext *wctx, int b);
void (*writer_put_str)(AVTextWriterContext *wctx, const char *str);
void (*writer_vprintf)(AVTextWriterContext *wctx, const char *fmt, va_list vl);

6
fftools/textformat/tw_avio.c
View File

@ -37,12 +37,14 @@ typedef struct IOWriterContext {
int close_on_uninit;
} IOWriterContext;
static av_cold void iowriter_uninit(AVTextWriterContext *wctx)
static av_cold int iowriter_uninit(AVTextWriterContext *wctx)
{
IOWriterContext *ctx = wctx->priv;
int ret = 0;
if (ctx->close_on_uninit)
avio_closep(&ctx->avio_context);
ret = avio_closep(&ctx->avio_context);
return ret;
}
static void io_w8(AVTextWriterContext *wctx, int b)