fix some potential security issues, patch by Matthias Hopf, mat at mshopf dot de

Originally committed as revision 7153 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index d6386b4..793f71a 100644 (file)
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -472,7 +472,10 @@ static int alac_decode_frame(AVCodecContext *avctx,
                 ALAC_EXTRADATA_SIZE);
             return input_buffer_size;
         }
-        alac_set_info(alac);
+        if (alac_set_info(alac)) {
+            av_log(avctx, AV_LOG_ERROR, "alac: set_info failed\n");
+            return input_buffer_size;
+        }
         alac->context_initialized = 1;
     }
 

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index bf5a093..358ecf2 100644 (file)
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -335,7 +335,8 @@ static int shorten_decode_frame(AVCodecContext *avctx,
         }
         s->nwrap = FFMAX(NWRAP, maxnlpc);
 
-        allocate_buffers(s);
+        if (allocate_buffers(s))
+            return -1;
 
         init_offset(s);