Merge branch 'issue-193' into 'master'
fix buffer overflow in tiff2ps.c Closes #193 See merge request libtiff/libtiff!162
This commit is contained in:
commit
7ade760d79
@ -2715,7 +2715,7 @@ PSDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
|
||||
#if defined( EXP_ASCII85ENCODER )
|
||||
if (alpha) {
|
||||
int adjust, i;
|
||||
for (i = 0; i < cc; i+=2) {
|
||||
for (i = 0; i < (cc - 1); i+=2) {
|
||||
adjust = 255 - cp[i + 1];
|
||||
cp[i / 2] = cp[i] + adjust;
|
||||
}
|
||||
@ -3048,7 +3048,7 @@ tsize_t Ascii85EncodeBlock( uint8 * ascii85_p, unsigned f_eod, const uint8 * raw
|
||||
tsize_t len; /* Output this many bytes */
|
||||
|
||||
len = raw_l + 1;
|
||||
val32 = *++raw_p << 24; /* Prime the pump */
|
||||
val32 = (uint32)*++raw_p << 24; /* Prime the pump */
|
||||
|
||||
if ( --raw_l > 0 ) val32 += *(++raw_p) << 16;
|
||||
if ( --raw_l > 0 ) val32 += *(++raw_p) << 8;
|
||||
|
Loading…
Reference in New Issue
Block a user