← Back to branch summary

~ubuntu-branches/ubuntu/raring/libav/raring-updates

« back to all changes in this revision

Viewing changes to libavformat/id3v2.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-10-21 13:43:38 UTC
  • mfrom: (1.2.17)
  • Revision ID: package-import@ubuntu.com-20131021134338-rjtug4o072t7xd8i
Tags: 6:0.8.8-0ubuntu0.13.04.1
https://launchpad.net/bugs/1242802
Update to 0.8.8 to fix multiple security issues (LP: #1242802)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/id3v2.c
510
510
                    goto seek;
511
511
                }
512
512
                b = buffer;
513
 
                while (avio_tell(s->pb) < end) {
 
513
                while (avio_tell(s->pb) < end && !s->pb->eof_reached) {
514
514
                    *b++ = avio_r8(s->pb);
515
 
                    if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1) {
 
515
                    if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1 &&
 
516
                        !s->pb->eof_reached ) {
516
517
                        uint8_t val = avio_r8(s->pb);
517
518
                        *b++ = val ? val : avio_r8(s->pb);
518
519
                    }