[FFmpeg-cvslog] h264_ps: fix memleak in ff_h264_decode_picture_parameter_set()

Michael Niedermayer git at videolan.org
Mon Jun 3 14:29:16 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 14:09:12 2013 +0200| [6952e2f82a8aaa8e0c378f82b518925179daa698] | committer: Michael Niedermayer

h264_ps: fix memleak in ff_h264_decode_picture_parameter_set()

Fixes: CID1026763
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6952e2f82a8aaa8e0c378f82b518925179daa698
---

 libavcodec/h264_ps.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 42a6903..ea121ed 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -599,10 +599,10 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length){
     qp_bd_offset = 6*(sps->bit_depth_luma-8);
     if (sps->bit_depth_luma > 14) {
         av_log(h->avctx, AV_LOG_ERROR, "Invalid luma bit depth=%d\n", sps->bit_depth_luma);
-        return AVERROR_INVALIDDATA;
+        goto fail;
     } else if (sps->bit_depth_luma == 11 || sps->bit_depth_luma == 13) {
         av_log(h->avctx, AV_LOG_ERROR, "Unimplemented luma bit depth=%d\n", sps->bit_depth_luma);
-        return AVERROR_PATCHWELCOME;
+        goto fail;
     }
 
     pps->cabac= get_bits1(&h->gb);



More information about the ffmpeg-cvslog mailing list