commit a2085a7e9d83d99aca58bfb385f6db1afa5673dd
author Kostya Shishkov <kostya.shishkov@gmail.com> Sat Sep 22 09:21:43 2007
committer Kostya Shishkov <kostya.shishkov@gmail.com> Sat Sep 22 09:21:43 2007
tree 320fcfb562dc17362a35293902440bf282f81684
parent 675a0583b42f7eeac145dd0adf6d66d87c2af892

Guard against output buffer overflows

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

libavcodec/dpcm.c

diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index 0ce05c8..c4a127d 100644
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -173,6 +173,10 @@
     if (!buf_size)
         return 0;
 
+    // almost every DPCM variant expands one byte of data into two
+    if(*data_size/2 < buf_size)
+        return -1;
+
     switch(avctx->codec->id) {
 
     case CODEC_ID_ROQ_DPCM:
@@ -256,6 +260,8 @@
     case CODEC_ID_SOL_DPCM:
         in = 0;
         if (avctx->codec_tag != 3) {
+            if(*data_size/4 < buf_size)
+                return -1;
             while (in < buf_size) {
                 int n1, n2;
                 n1 = (buf[in] >> 4) & 0xF;