| Message ID | 20230428163639.1573-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 1b7c13e1a437d7db84a206e5c55b0e0aa95760ec |
| Headers | show |
| Series | [FFmpeg-devel] fftools/ffmpeg_filter: fix leak of AVIOContext in read_binary() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Quoting James Almer (2023-04-28 18:36:39) > It was only being freed on failure. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > fftools/ffmpeg_filter.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Looks good, thanks
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index b26160b375..161ea9c866 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -408,11 +408,13 @@ static int read_binary(const char *path, uint8_t **data, int *len) *len = fsize; - return 0; + ret = 0; fail: avio_close(io); - av_freep(data); - *len = 0; + if (ret < 0) { + av_freep(data); + *len = 0; + } return ret; }
It was only being freed on failure. Signed-off-by: James Almer <jamrial@gmail.com> --- fftools/ffmpeg_filter.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)