← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg-extra/lucid-security

« back to all changes in this revision

Viewing changes to libavformat/mp3.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-12 11:45:36 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120612114536-y9tr1krewdu41h1x
Tags: 4:0.5.9-0ubuntu0.10.04.1
https://launchpad.net/bugs/1012132
* SECURITY UPDATE: Updated to libav 0.5.9 to fix multiple security
  issues. (LP: #1012132)
  - CVE-2011-3929
  - CVE-2011-3936
  - CVE-2011-3940
  - CVE-2011-3947
  - CVE-2011-3951
  - CVE-2011-3952
  - CVE-2012-0851
  - CVE-2012-0852
  - CVE-2012-0853
  - CVE-2012-0858
  - CVE-2012-0859
  - CVE-2012-0947
* Removed upstreamed patches:
  - CVE-2010-3429.patch
  - CVE-2010-3908.patch
  - CVE-2010-4704.patch
  - CVE-2011-0480.patch
  - CVE-2011-0722.patch
  - CVE-2011-0723.patch
  - CVE-2011-2161.patch
  - CVE-2011-3362.patch
  - CVE-2011-3504.patch
  - CVE-2011-4351.patch
  - CVE-2011-4353.patch
  - CVE-2011-4364.patch
  - CVE-2011-4579.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/mp3.c
246
246
        goto error;
247
247
    }
248
248
 
249
 
    if(isv34 && flags & 0x40) /* Extended header present, just skip over it */
250
 
        url_fskip(s->pb, id3v2_get_size(s->pb, 4));
 
249
    if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */
 
250
        int extlen = id3v2_get_size(s->pb, 4);
 
251
        if (version == 4)
 
252
            extlen -= 4;     // in v2.4 the length includes the length field we just read
 
253
 
 
254
        if (extlen < 0) {
 
255
            reason = "invalid extended header length";
 
256
            goto error;
 
257
        }
 
258
        url_fskip(s->pb, extlen);
 
259
    }
251
260
 
252
261
    while(len >= taghdrlen) {
253
262
        if(isv34) {