Merge branch 'issue-156' into 'master'

tiff2pdf: Check output size before writing

Closes #156

See merge request libtiff/libtiff!168
This commit is contained in:
Even Rouault 2020-11-21 17:33:59 +00:00
commit 59e38422f1

View File

@ -3329,6 +3329,14 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_
break; break;
} }
if (TIFFStripSize(output) > t2p->tiff_datasize) {
TIFFError(TIFF2PDF_MODULE,
"Size mismatch input %ld, output %ld",
t2p->tiff_datasize, TIFFStripSize(output));
_TIFFfree(buffer);
t2p->t2p_error = T2P_ERR_ERROR;
return(0);
}
t2p_enable(output); t2p_enable(output);
t2p->outputwritten = 0; t2p->outputwritten = 0;
bufferoffset = TIFFWriteEncodedStrip(output, (tstrip_t) 0, buffer, bufferoffset = TIFFWriteEncodedStrip(output, (tstrip_t) 0, buffer,