← Back to branch summary

~ubuntu-branches/ubuntu/precise/libav/precise-security

« back to all changes in this revision

Viewing changes to libavcodec/tscc.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-04-02 10:48:44 UTC
  • mfrom: (1.2.15)
  • Revision ID: package-import@ubuntu.com-20130402104844-x9zzg9sqgg9ckgo3
Tags: 4:0.8.6-0ubuntu0.12.04.1
https://launchpad.net/bugs/1163354
* Update to 0.8.6 to fix multiple security issues. (LP: #1163354)
  - CVE-2013-0894
  - CVE-2013-2277
  - CVE-2013-2495
  - CVE-2013-2496

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/tscc.c
58
58
    unsigned int decomp_size;
59
59
    // Decompression buffer
60
60
    unsigned char* decomp_buf;
 
61
    GetByteContext gb;
61
62
    int height;
62
63
    z_stream zstream;
63
64
 
105
106
    }
106
107
 
107
108
 
108
 
    if(zret != Z_DATA_ERROR)
109
 
        ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, c->decomp_buf, c->decomp_size - c->zstream.avail_out);
 
109
    if (zret != Z_DATA_ERROR) {
 
110
        bytestream2_init(&c->gb, c->decomp_buf,
 
111
                         c->decomp_size - c->zstream.avail_out);
 
112
        ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, &c->gb);
 
113
    }
110
114
 
111
115
    /* make the palette available on the way out */
112
116
    if (c->avctx->pix_fmt == PIX_FMT_PAL8) {