32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
--- tiff-4.0.6/libtiff/tif_pixarlog.c 2015-08-29 00:16:22.630733284 +0200
|
|
+++ tiff-4.0.6/libtiff/tif_pixarlog.c 2016-07-12 10:11:52.444459447 +0200
|
|
@@ -457,6 +457,7 @@
|
|
typedef struct {
|
|
TIFFPredictorState predict;
|
|
z_stream stream;
|
|
+ tmsize_t tbuf_size; /* only set/used on reading for now */
|
|
uint16 *tbuf;
|
|
uint16 stride;
|
|
int state;
|
|
@@ -692,6 +693,7 @@
|
|
sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
|
|
if (sp->tbuf == NULL)
|
|
return (0);
|
|
+ sp->tbuf_size = tbuf_size;
|
|
if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
|
|
sp->user_datafmt = PixarLogGuessDataFmt(td);
|
|
if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
|
|
@@ -781,6 +783,12 @@
|
|
TIFFErrorExt(tif->tif_clientdata, module, "ZLib cannot deal with buffers this size");
|
|
return (0);
|
|
}
|
|
+ /* Check that we will not fill more than what was allocated */
|
|
+ if ((tmsize_t)sp->stream.avail_out > sp->tbuf_size)
|
|
+ {
|
|
+ TIFFErrorExt(tif->tif_clientdata, module, "sp->stream.avail_out > sp->tbuf_size");
|
|
+ return (0);
|
|
+ }
|
|
do {
|
|
int state = inflate(&sp->stream, Z_PARTIAL_FLUSH);
|
|
if (state == Z_STREAM_END) {
|