← Back to branch summary

~ubuntu-branches/ubuntu/natty/tiff/natty-updates

« back to all changes in this revision

Viewing changes to libtiff/tif_fax3.h

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2011-03-14 10:41:44 UTC
  • Revision ID: james.westby@ubuntu.com-20110314104144-ijlgxo5oqy8kl7my
Tags: 3.9.4-5ubuntu3
https://launchpad.net/bugs/731540
* debian/patches/CVE-2011-0192.patch: update for regression in
  processing of certain CCITTFAX4 files (LP: #731540).
  - http://bugzilla.maptools.org/show_bug.cgi?id=2297

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtiff/tif_fax3.h
479
479
        case S_VL:                                                      \
480
480
            CHECK_b1;                                                   \
481
481
            if (b1 <= (int) (a0 + TabEnt->Param)) {                     \
482
 
                unexpected("VL", a0);                                   \
483
 
                goto eol2d;                                             \
 
482
                if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) { \
 
483
                    unexpected("VL", a0);                               \
 
484
                    goto eol2d;                                         \
 
485
                }                                                       \
484
486
            }                                                           \
485
487
            SETVALUE(b1 - a0 - TabEnt->Param);                          \
486
488
            b1 -= *--pb;                                                \