Search
SailfishOS Open Build Service
>
Projects
>
home:wdehoog
>
jasper
> jasper-CVE-2016-10251.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File jasper-CVE-2016-10251.patch of Package jasper
--- jasper-1.900.14/src/libjasper/jpc/jpc_t2cod.c 2017-03-16 09:23:44.445202359 +0100 +++ jasper-1.900.14/src/libjasper/jpc/jpc_t2cod.c 2017-03-16 09:25:00.433202141 +0100 @@ -432,18 +432,18 @@ &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno, ++pi->picomp) { pirlvl = pi->picomp->pirlvls; - pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn + - pi->picomp->numrlvls - 1)); - pi->ystep = pi->picomp->vsamp * (1 << (pirlvl->prcheightexpn + - pi->picomp->numrlvls - 1)); + pi->xstep = pi->picomp->hsamp * (JAS_CAST(uint_fast32_t, 1) << + (pirlvl->prcwidthexpn + pi->picomp->numrlvls - 1)); + pi->ystep = pi->picomp->vsamp * (JAS_CAST(uint_fast32_t, 1) << + (pirlvl->prcheightexpn + pi->picomp->numrlvls - 1)); for (rlvlno = 1, pirlvl = &pi->picomp->pirlvls[1]; rlvlno < pi->picomp->numrlvls; ++rlvlno, ++pirlvl) { - pi->xstep = JAS_MIN(pi->xstep, pi->picomp->hsamp * (1 << - (pirlvl->prcwidthexpn + pi->picomp->numrlvls - - rlvlno - 1))); - pi->ystep = JAS_MIN(pi->ystep, pi->picomp->vsamp * (1 << - (pirlvl->prcheightexpn + pi->picomp->numrlvls - - rlvlno - 1))); + pi->xstep = JAS_MIN(pi->xstep, pi->picomp->hsamp * + (JAS_CAST(uint_fast32_t, 1) << (pirlvl->prcwidthexpn + + pi->picomp->numrlvls - rlvlno - 1))); + pi->ystep = JAS_MIN(pi->ystep, pi->picomp->vsamp * + (JAS_CAST(uint_fast32_t, 1) << (pirlvl->prcheightexpn + + pi->picomp->numrlvls - rlvlno - 1))); } for (pi->y = pi->ystart; pi->y < pi->yend; pi->y += pi->ystep - (pi->y % pi->ystep)) { --- jasper-1.900.14/src/libjasper/jpc/jpc_t2cod.h 2017-03-16 09:23:44.445202359 +0100 +++ jasper-1.900.14/src/libjasper/jpc/jpc_t2cod.h 2017-03-16 09:25:00.433202141 +0100 @@ -129,10 +129,10 @@ jpc_pirlvl_t *pirlvls; /* The horizontal sampling period. */ - int hsamp; + uint_fast32_t hsamp; /* The vertical sampling period. */ - int vsamp; + uint_fast32_t vsamp; } jpc_picomp_t; @@ -171,32 +171,32 @@ int lyrno; /* The x-coordinate of the current position. */ - int x; + uint_fast32_t x; /* The y-coordinate of the current position. */ - int y; + uint_fast32_t y; /* The horizontal step size. */ - int xstep; + uint_fast32_t xstep; /* The vertical step size. */ - int ystep; + uint_fast32_t ystep; /* The x-coordinate of the top-left corner of the tile on the reference grid. */ - int xstart; + uint_fast32_t xstart; /* The y-coordinate of the top-left corner of the tile on the reference grid. */ - int ystart; + uint_fast32_t ystart; /* The x-coordinate of the bottom-right corner of the tile on the reference grid (plus one). */ - int xend; + uint_fast32_t xend; /* The y-coordinate of the bottom-right corner of the tile on the reference grid (plus one). */ - int yend; + uint_fast32_t yend; /* The current progression change. */ jpc_pchg_t *pchg;
