[FFmpeg-cvslog] avcodec/dirac: Fix memleak of dsh on error
Michael Niedermayer
git at videolan.org
Tue Feb 9 15:00:09 CET 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Feb 9 14:46:45 2016 +0100| [43a69655699bb115df6c760e14dbe319ac38e0cd] | committer: Michael Niedermayer
avcodec/dirac: Fix memleak of dsh on error
Fixes CID1351360
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43a69655699bb115df6c760e14dbe319ac38e0cd
---
libavcodec/dirac.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c
index 39df2a8..527f015 100644
--- a/libavcodec/dirac.c
+++ b/libavcodec/dirac.c
@@ -349,8 +349,10 @@ int av_dirac_parse_sequence_header(AVDiracSeqHeader **pdsh,
else if (dsh->version.major > 2 && log_ctx)
av_log(log_ctx, AV_LOG_WARNING, "Stream may have unhandled features\n");
- if (video_format > 20U)
- return AVERROR_INVALIDDATA;
+ if (video_format > 20U) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
/* Fill in defaults for the source parameters. */
dsh->width = dirac_source_parameters_defaults[video_format].width;
More information about the ffmpeg-cvslog
mailing list