[SCM] libav/wheezy-security: bytestream: add bytestream2_copy_buffer() functions

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit fa60904ebd58da33abf10b05e9933d24619cf096
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sun Sep 29 19:45:57 2013 -0400

    bytestream: add bytestream2_copy_buffer() functions
    
    This is basically an overread/overwrite-safe memcpy between a
    GetByteContext and a PutByteContext.
    
    CC:libav-stable at libav.org
    (cherry picked from commit 5748faf291fec297ef25d81962b52b3438f54278)

diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index 091cab8..6177241 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -333,6 +333,32 @@ static av_always_inline unsigned int bytestream2_get_eof(PutByteContext *p)
     return p->eof;
 }
 
+static av_always_inline unsigned int bytestream2_copy_bufferu(PutByteContext *p,
+                                                              GetByteContext *g,
+                                                              unsigned int size)
+{
+    memcpy(p->buffer, g->buffer, size);
+    p->buffer += size;
+    g->buffer += size;
+    return size;
+}
+
+static av_always_inline unsigned int bytestream2_copy_buffer(PutByteContext *p,
+                                                             GetByteContext *g,
+                                                             unsigned int size)
+{
+    int size2;
+
+    if (p->eof)
+        return 0;
+    size  = FFMIN(g->buffer_end - g->buffer, size);
+    size2 = FFMIN(p->buffer_end - p->buffer, size);
+    if (size2 != size)
+        p->eof = 1;
+
+    return bytestream2_copy_bufferu(p, g, size2);
+}
+
 static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b,
                                                            uint8_t *dst,
                                                            unsigned int size)

-- 
Libav/FFmpeg packaging