dany/pdfio
1
0
Fork 0
mirror of https://github.com/michaelrsweet/pdfio.git synced 2025-10-31 10:26:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading of streams with indirect lengths.

Browse Source
This commit is contained in:
Michael R Sweet
2021-06-21 16:18:06 -04:00
parent 01ca711ec8
commit 3844abdf92
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pdfio-stream.c
View File

@@ -325,6 +325,8 @@ _pdfioStreamOpen(pdfio_obj_t *obj, // I - Object
// Object dictionary // Object dictionary
PDFIO_DEBUG("_pdfioStreamOpen(obj=%p(%u), decode=%s)\n", obj, (unsigned)obj->number, decode ? "true" : "false");
// Allocate a new stream object... // Allocate a new stream object...
if ((st = (pdfio_stream_t *)calloc(1, sizeof(pdfio_stream_t))) == NULL) if ((st = (pdfio_stream_t *)calloc(1, sizeof(pdfio_stream_t))) == NULL)
{ {
@@ -335,13 +337,13 @@ _pdfioStreamOpen(pdfio_obj_t *obj, // I - Object
st->pdf = obj->pdf; st->pdf = obj->pdf;
st->obj = obj; st->obj = obj;
if (_pdfioFileSeek(st->pdf, obj->stream_offset, SEEK_SET) != obj->stream_offset) if ((st->remaining = pdfioObjGetLength(obj)) == 0)
{ {
free(st); free(st);
return (NULL); return (NULL);
} }
if ((st->remaining = pdfioObjGetLength(obj)) == 0) if (_pdfioFileSeek(st->pdf, obj->stream_offset, SEEK_SET) != obj->stream_offset)
{ {
free(st); free(st);
return (NULL); return (NULL);
@@ -448,7 +450,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj, // I - Object
st->flate.next_in = (Bytef *)st->cbuffer; st->flate.next_in = (Bytef *)st->cbuffer;
st->flate.avail_in = (uInt)_pdfioFileRead(st->pdf, st->cbuffer, sizeof(st->cbuffer)); st->flate.avail_in = (uInt)_pdfioFileRead(st->pdf, st->cbuffer, sizeof(st->cbuffer));
PDFIO_DEBUG("_pdfioStreamOpen: avail_in=%u\n", st->flate.avail_in); PDFIO_DEBUG("_pdfioStreamOpen: avail_in=%u, cbuffer=<%02X%02X%02X%02X%02X%02X%02X%02X...>\n", st->flate.avail_in, st->cbuffer[0], st->cbuffer[1], st->cbuffer[2], st->cbuffer[3], st->cbuffer[4], st->cbuffer[5], st->cbuffer[6], st->cbuffer[7]);
if (inflateInit(&(st->flate)) != Z_OK) if (inflateInit(&(st->flate)) != Z_OK)
{ {